From ae27688acf0d0182e04c51f4f1c4c0d28b0daa0d Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Fri, 6 Sep 2024 15:37:21 -0700
Subject: [PATCH 1/8] add non nullable types to collections

---
 packages/pigeon/CHANGELOG.md                  |     4 +
 packages/pigeon/lib/dart_generator.dart       |     4 +-
 packages/pigeon/lib/generator_tools.dart      |     2 +-
 packages/pigeon/lib/objc_generator.dart       |     3 +-
 packages/pigeon/lib/pigeon_lib.dart           |     9 -
 packages/pigeon/lib/swift_generator.dart      |    25 +-
 packages/pigeon/pigeons/core_tests.dart       |   256 +-
 .../AlternateLanguageTestPlugin.java          |   164 +
 .../CoreTests.java                            |  2615 +-
 .../AllDatatypesTest.java                     |     2 +
 .../ios/RunnerTests/AllDatatypesTest.m        |     6 +
 .../ios/Classes/AlternateLanguageTestPlugin.m |   215 +-
 .../ios/Classes/CoreTests.gen.h               |   174 +-
 .../ios/Classes/CoreTests.gen.m               |  1207 +-
 .../Classes/AlternateLanguageTestPlugin.m     |   215 +-
 .../macos/Classes/CoreTests.gen.h             |   174 +-
 .../macos/Classes/CoreTests.gen.m             |  1207 +-
 .../lib/integration_tests.dart                |   324 +-
 .../lib/src/generated/core_tests.gen.dart     |  1473 +-
 .../src/generated/proxy_api_tests.gen.dart    |    12 +-
 .../lib/test_types.dart                       |   291 +-
 .../com/example/test_plugin/CoreTests.gen.kt  |  1289 +-
 .../com/example/test_plugin/TestPlugin.kt     |   138 +
 .../example/test_plugin/AllDatatypesTest.kt   |     4 +-
 .../ios/RunnerTests/AllDatatypesTests.swift   |     6 +-
 .../ios/Classes/CoreTests.gen.swift           |   995 +-
 .../test_plugin/ios/Classes/TestPlugin.swift  |   209 +
 .../linux/pigeon/core_tests.gen.cc            | 21486 ++++++++++------
 .../test_plugin/linux/pigeon/core_tests.gen.h |  3316 ++-
 .../test_plugin/linux/test_plugin.cc          |   678 +-
 .../macos/Classes/CoreTests.gen.swift         |   995 +-
 .../macos/Classes/TestPlugin.swift            |   209 +
 .../windows/pigeon/core_tests.gen.cpp         |  1860 +-
 .../windows/pigeon/core_tests.gen.h           |   176 +-
 .../test_plugin/windows/test_plugin.cpp       |   192 +
 .../test_plugin/windows/test_plugin.h         |    92 +
 packages/pigeon/pubspec.yaml                  |     2 +-
 packages/pigeon/test/pigeon_lib_test.dart     |    19 -
 38 files changed, 29972 insertions(+), 10076 deletions(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index dd4626e7715..2ee6f50be5c 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 22.4.0
+
+* Adds support for nullable types in collections.
+
 ## 22.3.0
 
 * Adds support for enums and classes in collections.
diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart
index 1746a120240..2bd1e4117f7 100644
--- a/packages/pigeon/lib/dart_generator.dart
+++ b/packages/pigeon/lib/dart_generator.dart
@@ -2159,8 +2159,8 @@ String _getMethodParameterSignature(Iterable<Parameter> parameters) {
 String _flattenTypeArguments(List<TypeDeclaration> args) {
   return args
       .map<String>((TypeDeclaration arg) => arg.typeArguments.isEmpty
-          ? '${arg.baseName}?'
-          : '${arg.baseName}<${_flattenTypeArguments(arg.typeArguments)}>?')
+          ? '${arg.baseName}${arg.isNullable ? '?' : ''}'
+          : '${arg.baseName}<${_flattenTypeArguments(arg.typeArguments)}>${arg.isNullable ? '?' : ''}')
       .join(', ');
 }
 
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 59b19df3513..1474098aeac 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -14,7 +14,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '22.3.0';
+const String pigeonVersion = '22.4.0';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {
diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart
index cb93354c677..ec0caf3eebb 100644
--- a/packages/pigeon/lib/objc_generator.dart
+++ b/packages/pigeon/lib/objc_generator.dart
@@ -1444,7 +1444,8 @@ String _flattenTypeArguments(String? classPrefix, List<TypeDeclaration> args) {
       return _enumName(e.baseName,
           prefix: classPrefix, box: true, suffix: ' *');
     }
-    return _objcTypeForDartType(classPrefix, e).toString();
+    return _objcTypeForDartType(classPrefix, e, forceNullability: true)
+        .toString();
   }).join(', ');
   return result;
 }
diff --git a/packages/pigeon/lib/pigeon_lib.dart b/packages/pigeon/lib/pigeon_lib.dart
index b13ff30ca10..0d42a849fab 100644
--- a/packages/pigeon/lib/pigeon_lib.dart
+++ b/packages/pigeon/lib/pigeon_lib.dart
@@ -971,15 +971,6 @@ List<Error> _validateAst(Root root, String source) {
           lineNumber: _calculateLineNumberNullable(source, field.offset),
         ));
       }
-      for (final TypeDeclaration typeArgument in field.type.typeArguments) {
-        if (!typeArgument.isNullable) {
-          result.add(Error(
-            message:
-                'Generic type parameters must be nullable in field "${field.name}" in class "${classDefinition.name}".',
-            lineNumber: _calculateLineNumberNullable(source, field.offset),
-          ));
-        }
-      }
       if (!(validTypes.contains(field.type.baseName) ||
           customClasses.contains(field.type.baseName) ||
           customEnums.contains(field.type.baseName))) {
diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart
index e54fcb6ad88..9b4bf79fdd3 100644
--- a/packages/pigeon/lib/swift_generator.dart
+++ b/packages/pigeon/lib/swift_generator.dart
@@ -1031,8 +1031,7 @@ String _flattenTypeArguments(List<TypeDeclaration> args) {
 }
 
 String _swiftTypeForBuiltinGenericDartType(TypeDeclaration type) {
-  if (type.typeArguments.isEmpty ||
-      (type.typeArguments.first.baseName == 'Object')) {
+  if (type.typeArguments.isEmpty) {
     if (type.baseName == 'List') {
       return '[Any?]';
     } else if (type.baseName == 'Map') {
@@ -1044,14 +1043,17 @@ String _swiftTypeForBuiltinGenericDartType(TypeDeclaration type) {
     if (type.baseName == 'List') {
       return '[${_nullSafeSwiftTypeForDartType(type.typeArguments.first)}]';
     } else if (type.baseName == 'Map') {
-      return '[${_nullSafeSwiftTypeForDartType(type.typeArguments.first)}: ${_nullSafeSwiftTypeForDartType(type.typeArguments.last)}]';
+      return '[${_nullSafeSwiftTypeForDartType(type.typeArguments.first, mapKey: true)}: ${_nullSafeSwiftTypeForDartType(type.typeArguments.last)}]';
     } else {
       return '${type.baseName}<${_flattenTypeArguments(type.typeArguments)}>';
     }
   }
 }
 
-String? _swiftTypeForBuiltinDartType(TypeDeclaration type) {
+String? _swiftTypeForBuiltinDartType(
+  TypeDeclaration type, {
+  bool mapKey = false,
+}) {
   const Map<String, String> swiftTypeForDartTypeMap = <String, String>{
     'void': 'Void',
     'bool': 'Bool',
@@ -1065,7 +1067,9 @@ String? _swiftTypeForBuiltinDartType(TypeDeclaration type) {
     'Float64List': 'FlutterStandardTypedData',
     'Object': 'Any',
   };
-  if (swiftTypeForDartTypeMap.containsKey(type.baseName)) {
+  if (mapKey && type.baseName == 'Object') {
+    return 'AnyHashable';
+  } else if (swiftTypeForDartTypeMap.containsKey(type.baseName)) {
     return swiftTypeForDartTypeMap[type.baseName];
   } else if (type.baseName == 'List' || type.baseName == 'Map') {
     return _swiftTypeForBuiltinGenericDartType(type);
@@ -1074,13 +1078,16 @@ String? _swiftTypeForBuiltinDartType(TypeDeclaration type) {
   }
 }
 
-String _swiftTypeForDartType(TypeDeclaration type) {
-  return _swiftTypeForBuiltinDartType(type) ?? type.baseName;
+String _swiftTypeForDartType(TypeDeclaration type, {bool mapKey = false}) {
+  return _swiftTypeForBuiltinDartType(type, mapKey: mapKey) ?? type.baseName;
 }
 
-String _nullSafeSwiftTypeForDartType(TypeDeclaration type) {
+String _nullSafeSwiftTypeForDartType(
+  TypeDeclaration type, {
+  bool mapKey = false,
+}) {
   final String nullSafe = type.isNullable ? '?' : '';
-  return '${_swiftTypeForDartType(type)}$nullSafe';
+  return '${_swiftTypeForDartType(type, mapKey: mapKey)}$nullSafe';
 }
 
 String _getMethodSignature({
diff --git a/packages/pigeon/pigeons/core_tests.dart b/packages/pigeon/pigeons/core_tests.dart
index 560aa4b532a..9d4232be8ef 100644
--- a/packages/pigeon/pigeons/core_tests.dart
+++ b/packages/pigeon/pigeons/core_tests.dart
@@ -50,13 +50,20 @@ class AllTypes {
     required this.doubleList,
     required this.boolList,
     required this.enumList,
+    required this.objectList,
     required this.listList,
+    // required this.mapList,
 
     // Maps
     required this.map,
     required this.stringMap,
     required this.intMap,
+    // required this.doubleMap,
+    // required this.boolMap,
     required this.enumMap,
+    required this.objectMap,
+    // required this.listMap,
+    // required this.mapMap,
   });
 
   bool aBool;
@@ -75,19 +82,26 @@ class AllTypes {
   // Lists
   // ignore: strict_raw_type, always_specify_types
   List list;
-  List<String?> stringList;
-  List<int?> intList;
-  List<double?> doubleList;
-  List<bool?> boolList;
-  List<AnEnum?> enumList;
-  List<List<Object?>?> listList;
+  List<String> stringList;
+  List<int> intList;
+  List<double> doubleList;
+  List<bool> boolList;
+  List<AnEnum> enumList;
+  List<Object> objectList;
+  List<List<Object?>> listList;
+  // List<Map<Object?, Object?>> mapList;
 
   // Maps
   // ignore: strict_raw_type, always_specify_types
   Map map;
-  Map<String?, String?> stringMap;
-  Map<int?, int?> intMap;
-  Map<AnEnum?, AnEnum?> enumMap;
+  Map<String, String> stringMap;
+  Map<int, int> intMap;
+  // Map<double, double> doubleMap;
+  // Map<int, bool> boolMap;
+  Map<AnEnum, AnEnum> enumMap;
+  Map<Object, Object> objectMap;
+  // Map<int, List<Object?>> listMap;
+  // Map<int, Map<Object?, Object?>> mapMap;
 }
 
 /// A class containing all supported nullable types.
@@ -117,14 +131,21 @@ class AllNullableTypes {
     this.doubleList,
     this.boolList,
     this.enumList,
+    this.objectList,
     this.listList,
+    // this.mapList,
     this.recursiveClassList,
 
     // Maps
     this.map,
     this.stringMap,
     this.intMap,
+    // this.doubleMap,
+    // this.boolMap,
     this.enumMap,
+    this.objectMap,
+    // this.listMap,
+    // this.mapMap,
     this.recursiveClassMap,
   );
 
@@ -150,7 +171,9 @@ class AllNullableTypes {
   List<double?>? doubleList;
   List<bool?>? boolList;
   List<AnEnum?>? enumList;
+  List<Object?>? objectList;
   List<List<Object?>?>? listList;
+  // List<Map<Object?, Object?>?>? mapList;
   List<AllNullableTypes?>? recursiveClassList;
 
   // Maps
@@ -158,7 +181,12 @@ class AllNullableTypes {
   Map? map;
   Map<String?, String?>? stringMap;
   Map<int?, int?>? intMap;
+  // Map<double, double?>? doubleMap;
+  // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
+  Map<Object?, Object?>? objectMap;
+  // Map<int, List<Object?>?>? listMap;
+  // Map<int, Map<Object?, Object?>?>? mapMap;
   Map<int?, AllNullableTypes?>? recursiveClassMap;
 }
 
@@ -189,13 +217,20 @@ class AllNullableTypesWithoutRecursion {
     this.doubleList,
     this.boolList,
     this.enumList,
+    this.objectList,
     this.listList,
+    // this.mapList,
 
     // Maps
     this.map,
     this.stringMap,
     this.intMap,
+    // this.doubleMap,
+    // this.boolMap,
     this.enumMap,
+    this.objectMap,
+    // this.listMap,
+    // this.mapMap,
   );
 
   bool? aNullableBool;
@@ -219,14 +254,21 @@ class AllNullableTypesWithoutRecursion {
   List<double?>? doubleList;
   List<bool?>? boolList;
   List<AnEnum?>? enumList;
+  List<Object?>? objectList;
   List<List<Object?>?>? listList;
+  // List<Map<Object?, Object?>?>? mapList;
 
   // Maps
   // ignore: strict_raw_type, always_specify_types
   Map? map;
   Map<String?, String?>? stringMap;
   Map<int?, int?>? intMap;
+  // Map<double, double?>? doubleMap;
+  // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
+  Map<Object?, Object?>? objectMap;
+  // Map<int, List<Object?>?>? listMap;
+  // Map<int, Map<String, String?>?>? mapMap;
 }
 
 /// A class for testing nested class handling.
@@ -322,6 +364,16 @@ abstract class HostIntegrationCoreApi {
   @SwiftFunction('echo(classList:)')
   List<AllNullableTypes?> echoClassList(List<AllNullableTypes?> classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullEnumList:')
+  @SwiftFunction('echoNonNull(enumList:)')
+  List<AnEnum> echoNonNullEnumList(List<AnEnum> enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullClassList:')
+  @SwiftFunction('echoNonNull(classList:)')
+  List<AllNullableTypes> echoNonNullClassList(List<AllNullableTypes> classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   @ObjCSelector('echoMap:')
   @SwiftFunction('echo(_:)')
@@ -348,6 +400,27 @@ abstract class HostIntegrationCoreApi {
   Map<int?, AllNullableTypes?> echoClassMap(
       Map<int?, AllNullableTypes?> classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullStringMap:')
+  @SwiftFunction('echoNonNull(stringMap:)')
+  Map<String, String> echoNonNullStringMap(Map<String, String> stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullIntMap:')
+  @SwiftFunction('echoNonNull(intMap:)')
+  Map<int, int> echoNonNullIntMap(Map<int, int> intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullEnumMap:')
+  @SwiftFunction('echoNonNull(enumMap:)')
+  Map<AnEnum, AnEnum> echoNonNullEnumMap(Map<AnEnum, AnEnum> enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullClassMap:')
+  @SwiftFunction('echoNonNull(classMap:)')
+  Map<int, AllNullableTypes> echoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap);
+
   /// Returns the passed class to test nested class serialization and deserialization.
   @ObjCSelector('echoClassWrapper:')
   @SwiftFunction('echo(_:)')
@@ -462,6 +535,17 @@ abstract class HostIntegrationCoreApi {
   List<AllNullableTypes?>? echoNullableClassList(
       List<AllNullableTypes?>? classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullEnumList:')
+  @SwiftFunction('echoNullableNonNull(enumList:)')
+  List<AnEnum>? echoNullableNonNullEnumList(List<AnEnum>? enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullClassList:')
+  @SwiftFunction('echoNullableNonNull(classList:)')
+  List<AllNullableTypes>? echoNullableNonNullClassList(
+      List<AllNullableTypes>? classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   @ObjCSelector('echoNullableMap:')
   @SwiftFunction('echoNullable(_:)')
@@ -489,6 +573,28 @@ abstract class HostIntegrationCoreApi {
   Map<int?, AllNullableTypes?>? echoNullableClassMap(
       Map<int?, AllNullableTypes?>? classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullStringMap:')
+  @SwiftFunction('echoNullableNonNull(stringMap:)')
+  Map<String, String>? echoNullableNonNullStringMap(
+      Map<String, String>? stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullIntMap:')
+  @SwiftFunction('echoNullableNonNull(intMap:)')
+  Map<int, int>? echoNullableNonNullIntMap(Map<int, int>? intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullEnumMap:')
+  @SwiftFunction('echoNullableNonNull(enumMap:)')
+  Map<AnEnum, AnEnum>? echoNullableNonNullEnumMap(Map<AnEnum, AnEnum>? enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullClassMap:')
+  @SwiftFunction('echoNullableNonNull(classMap:)')
+  Map<int, AllNullableTypes>? echoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap);
+
   @ObjCSelector('echoNullableEnum:')
   @SwiftFunction('echoNullable(_:)')
   AnEnum? echoNullableEnum(AnEnum? anEnum);
@@ -829,6 +935,17 @@ abstract class HostIntegrationCoreApi {
   List<AllNullableTypes?> callFlutterEchoClassList(
       List<AllNullableTypes?> classList);
 
+  @async
+  @ObjCSelector('callFlutterEchoNonNullEnumList:')
+  @SwiftFunction('callFlutterEchoNonNull(enumList:)')
+  List<AnEnum> callFlutterEchoNonNullEnumList(List<AnEnum> enumList);
+
+  @async
+  @ObjCSelector('callFlutterEchoNonNullClassList:')
+  @SwiftFunction('callFlutterEchoNonNull(classList:)')
+  List<AllNullableTypes> callFlutterEchoNonNullClassList(
+      List<AllNullableTypes> classList);
+
   @async
   @ObjCSelector('callFlutterEchoMap:')
   @SwiftFunction('callFlutterEcho(_:)')
@@ -856,6 +973,29 @@ abstract class HostIntegrationCoreApi {
   Map<int?, AllNullableTypes?> callFlutterEchoClassMap(
       Map<int?, AllNullableTypes?> classMap);
 
+  @async
+  @ObjCSelector('callFlutterEchoNonNullStringMap:')
+  @SwiftFunction('callFlutterEchoNonNull(stringMap:)')
+  Map<String, String> callFlutterEchoNonNullStringMap(
+      Map<String, String> stringMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNonNullIntMap:')
+  @SwiftFunction('callFlutterEchoNonNull(intMap:)')
+  Map<int, int> callFlutterEchoNonNullIntMap(Map<int, int> intMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNonNullEnumMap:')
+  @SwiftFunction('callFlutterEchoNonNull(enumMap:)')
+  Map<AnEnum, AnEnum> callFlutterEchoNonNullEnumMap(
+      Map<AnEnum, AnEnum> enumMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNonNullClassMap:')
+  @SwiftFunction('callFlutterEchoNonNull(classMap:)')
+  Map<int, AllNullableTypes> callFlutterEchoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap);
+
   @async
   @ObjCSelector('callFlutterEchoEnum:')
   @SwiftFunction('callFlutterEcho(_:)')
@@ -907,6 +1047,17 @@ abstract class HostIntegrationCoreApi {
   List<AllNullableTypes?>? callFlutterEchoNullableClassList(
       List<AllNullableTypes?>? classList);
 
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullEnumList:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(enumList:)')
+  List<AnEnum>? callFlutterEchoNullableNonNullEnumList(List<AnEnum>? enumList);
+
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullClassList:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(classList:)')
+  List<AllNullableTypes>? callFlutterEchoNullableNonNullClassList(
+      List<AllNullableTypes>? classList);
+
   @async
   @ObjCSelector('callFlutterEchoNullableMap:')
   @SwiftFunction('callFlutterEchoNullable(_:)')
@@ -935,6 +1086,29 @@ abstract class HostIntegrationCoreApi {
   Map<int?, AllNullableTypes?>? callFlutterEchoNullableClassMap(
       Map<int?, AllNullableTypes?>? classMap);
 
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullStringMap:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(stringMap:)')
+  Map<String, String>? callFlutterEchoNullableNonNullStringMap(
+      Map<String, String>? stringMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullIntMap:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(intMap:)')
+  Map<int, int>? callFlutterEchoNullableNonNullIntMap(Map<int, int>? intMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullEnumMap:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(enumMap:)')
+  Map<AnEnum, AnEnum>? callFlutterEchoNullableNonNullEnumMap(
+      Map<AnEnum, AnEnum>? enumMap);
+
+  @async
+  @ObjCSelector('callFlutterEchoNullableNonNullClassMap:')
+  @SwiftFunction('callFlutterEchoNullableNonNull(classMap:)')
+  Map<int, AllNullableTypes>? callFlutterEchoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap);
+
   @async
   @ObjCSelector('callFlutterEchoNullableEnum:')
   @SwiftFunction('callFlutterEchoNullable(_:)')
@@ -1040,6 +1214,16 @@ abstract class FlutterIntegrationCoreApi {
   @SwiftFunction('echo(classList:)')
   List<AllNullableTypes?> echoClassList(List<AllNullableTypes?> classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullEnumList:')
+  @SwiftFunction('echoNonNull(enumList:)')
+  List<AnEnum> echoNonNullEnumList(List<AnEnum> enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullClassList:')
+  @SwiftFunction('echoNonNull(classList:)')
+  List<AllNullableTypes> echoNonNullClassList(List<AllNullableTypes> classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   @ObjCSelector('echoMap:')
   @SwiftFunction('echo(_:)')
@@ -1066,6 +1250,27 @@ abstract class FlutterIntegrationCoreApi {
   Map<int?, AllNullableTypes?> echoClassMap(
       Map<int?, AllNullableTypes?> classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullStringMap:')
+  @SwiftFunction('echoNonNull(stringMap:)')
+  Map<String, String> echoNonNullStringMap(Map<String, String> stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullIntMap:')
+  @SwiftFunction('echoNonNull(intMap:)')
+  Map<int, int> echoNonNullIntMap(Map<int, int> intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullEnumMap:')
+  @SwiftFunction('echoNonNull(enumMap:)')
+  Map<AnEnum, AnEnum> echoNonNullEnumMap(Map<AnEnum, AnEnum> enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNonNullClassMap:')
+  @SwiftFunction('echoNonNull(classMap:)')
+  Map<int, AllNullableTypes> echoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap);
+
   /// Returns the passed enum to test serialization and deserialization.
   @ObjCSelector('echoEnum:')
   @SwiftFunction('echo(_:)')
@@ -1119,6 +1324,17 @@ abstract class FlutterIntegrationCoreApi {
   List<AllNullableTypes?>? echoNullableClassList(
       List<AllNullableTypes?>? classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullEnumList:')
+  @SwiftFunction('echoNullableNonNull(enumList:)')
+  List<AnEnum>? echoNullableNonNullEnumList(List<AnEnum>? enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullClassList:')
+  @SwiftFunction('echoNullableNonNull(classList:)')
+  List<AllNullableTypes>? echoNullableNonNullClassList(
+      List<AllNullableTypes>? classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   @ObjCSelector('echoNullableMap:')
   @SwiftFunction('echoNullable(_:)')
@@ -1146,6 +1362,28 @@ abstract class FlutterIntegrationCoreApi {
   Map<int?, AllNullableTypes?>? echoNullableClassMap(
       Map<int?, AllNullableTypes?>? classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullStringMap:')
+  @SwiftFunction('echoNullableNonNull(stringMap:)')
+  Map<String, String>? echoNullableNonNullStringMap(
+      Map<String, String>? stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullIntMap:')
+  @SwiftFunction('echoNullableNonNull(intMap:)')
+  Map<int, int>? echoNullableNonNullIntMap(Map<int, int>? intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullEnumMap:')
+  @SwiftFunction('echoNullableNonNull(enumMap:)')
+  Map<AnEnum, AnEnum>? echoNullableNonNullEnumMap(Map<AnEnum, AnEnum>? enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  @ObjCSelector('echoNullableNonNullClassMap:')
+  @SwiftFunction('echoNullableNonNull(classMap:)')
+  Map<int, AllNullableTypes>? echoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap);
+
   /// Returns the passed enum to test serialization and deserialization.
   @ObjCSelector('echoNullableEnum:')
   @SwiftFunction('echoNullable(_:)')
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java
index 7b893387223..8580645a27d 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java
@@ -126,6 +126,18 @@ public void throwErrorFromVoid() {
     return classList;
   }
 
+  @NonNull
+  @Override
+  public List<AnEnum> echoNonNullEnumList(@NonNull List<AnEnum> enumList) {
+    return enumList;
+  }
+
+  @NonNull
+  @Override
+  public List<AllNullableTypes> echoNonNullClassList(@NonNull List<AllNullableTypes> classList) {
+    return classList;
+  }
+
   @Override
   public @NonNull Map<Object, Object> echoMap(@NonNull Map<Object, Object> map) {
     return map;
@@ -152,6 +164,31 @@ public void throwErrorFromVoid() {
     return classMap;
   }
 
+  @NonNull
+  @Override
+  public Map<String, String> echoNonNullStringMap(@NonNull Map<String, String> stringMap) {
+    return stringMap;
+  }
+
+  @NonNull
+  @Override
+  public Map<Long, Long> echoNonNullIntMap(@NonNull Map<Long, Long> intMap) {
+    return intMap;
+  }
+
+  @NonNull
+  @Override
+  public Map<AnEnum, AnEnum> echoNonNullEnumMap(@NonNull Map<AnEnum, AnEnum> enumMap) {
+    return enumMap;
+  }
+
+  @NonNull
+  @Override
+  public Map<Long, AllNullableTypes> echoNonNullClassMap(
+      @NonNull Map<Long, AllNullableTypes> classMap) {
+    return classMap;
+  }
+
   @Override
   public @NonNull AllClassesWrapper echoClassWrapper(@NonNull AllClassesWrapper wrapper) {
     return wrapper;
@@ -268,6 +305,19 @@ public void throwErrorFromVoid() {
     return classList;
   }
 
+  @Nullable
+  @Override
+  public List<AnEnum> echoNullableNonNullEnumList(@Nullable List<AnEnum> enumList) {
+    return enumList;
+  }
+
+  @Nullable
+  @Override
+  public List<AllNullableTypes> echoNullableNonNullClassList(
+      @Nullable List<AllNullableTypes> classList) {
+    return classList;
+  }
+
   @Override
   public @Nullable Map<Object, Object> echoNullableMap(@Nullable Map<Object, Object> map) {
     return map;
@@ -295,6 +345,31 @@ public void throwErrorFromVoid() {
     return classMap;
   }
 
+  @Nullable
+  @Override
+  public Map<String, String> echoNullableNonNullStringMap(@Nullable Map<String, String> stringMap) {
+    return stringMap;
+  }
+
+  @Nullable
+  @Override
+  public Map<Long, Long> echoNullableNonNullIntMap(@Nullable Map<Long, Long> intMap) {
+    return intMap;
+  }
+
+  @Nullable
+  @Override
+  public Map<AnEnum, AnEnum> echoNullableNonNullEnumMap(@Nullable Map<AnEnum, AnEnum> enumMap) {
+    return enumMap;
+  }
+
+  @Nullable
+  @Override
+  public Map<Long, AllNullableTypes> echoNullableNonNullClassMap(
+      @Nullable Map<Long, AllNullableTypes> classMap) {
+    return classMap;
+  }
+
   @Override
   public @Nullable AnEnum echoNullableEnum(@Nullable AnEnum anEnum) {
     return anEnum;
@@ -653,6 +728,20 @@ public void callFlutterEchoClassList(
     flutterApi.echoClassList(classNullableTypes, result);
   }
 
+  @Override
+  public void callFlutterEchoNonNullEnumList(
+      @NonNull List<AnEnum> enumList, @NonNull Result<List<AnEnum>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullEnumList(enumList, result);
+  }
+
+  @Override
+  public void callFlutterEchoNonNullClassList(
+      @NonNull List<AllNullableTypes> classList, @NonNull Result<List<AllNullableTypes>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullClassList(classList, result);
+  }
+
   @Override
   public void callFlutterEchoMap(
       @NonNull Map<Object, Object> map, @NonNull Result<Map<Object, Object>> result) {
@@ -689,6 +778,35 @@ public void callFlutterEchoClassMap(
     flutterApi.echoClassMap(classMap, result);
   }
 
+  @Override
+  public void callFlutterEchoNonNullStringMap(
+      @NonNull Map<String, String> stringMap, @NonNull Result<Map<String, String>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullStringMap(stringMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNonNullIntMap(
+      @NonNull Map<Long, Long> intMap, @NonNull Result<Map<Long, Long>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullIntMap(intMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNonNullEnumMap(
+      @NonNull Map<AnEnum, AnEnum> enumMap, @NonNull Result<Map<AnEnum, AnEnum>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullEnumMap(enumMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNonNullClassMap(
+      @NonNull Map<Long, AllNullableTypes> classMap,
+      @NonNull Result<Map<Long, AllNullableTypes>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNonNullClassMap(classMap, result);
+  }
+
   @Override
   public void callFlutterEchoEnum(@NonNull AnEnum anEnum, @NonNull Result<AnEnum> result) {
     assert flutterApi != null;
@@ -759,6 +877,21 @@ public void callFlutterEchoNullableClassList(
     flutterApi.echoNullableClassList(classList, result);
   }
 
+  @Override
+  public void callFlutterEchoNullableNonNullEnumList(
+      @Nullable List<AnEnum> enumList, @NonNull NullableResult<List<AnEnum>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullEnumList(enumList, result);
+  }
+
+  @Override
+  public void callFlutterEchoNullableNonNullClassList(
+      @Nullable List<AllNullableTypes> classList,
+      @NonNull NullableResult<List<AllNullableTypes>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullClassList(classList, result);
+  }
+
   @Override
   public void callFlutterEchoNullableMap(
       @Nullable Map<Object, Object> map, @NonNull NullableResult<Map<Object, Object>> result) {
@@ -796,6 +929,37 @@ public void callFlutterEchoNullableClassMap(
     flutterApi.echoNullableClassMap(classMap, result);
   }
 
+  @Override
+  public void callFlutterEchoNullableNonNullStringMap(
+      @Nullable Map<String, String> stringMap,
+      @NonNull NullableResult<Map<String, String>> result) {
+
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullStringMap(stringMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNullableNonNullIntMap(
+      @Nullable Map<Long, Long> intMap, @NonNull NullableResult<Map<Long, Long>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullIntMap(intMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNullableNonNullEnumMap(
+      @Nullable Map<AnEnum, AnEnum> enumMap, @NonNull NullableResult<Map<AnEnum, AnEnum>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullEnumMap(enumMap, result);
+  }
+
+  @Override
+  public void callFlutterEchoNullableNonNullClassMap(
+      @Nullable Map<Long, AllNullableTypes> classMap,
+      @NonNull NullableResult<Map<Long, AllNullableTypes>> result) {
+    assert flutterApi != null;
+    flutterApi.echoNullableNonNullClassMap(classMap, result);
+  }
+
   @Override
   public void callFlutterEchoNullableEnum(
       @Nullable AnEnum anEnum, @NonNull NullableResult<AnEnum> result) {
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
index 38344fe61f5..bd306279ee7 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
@@ -400,6 +400,19 @@ public void setEnumList(@NonNull List<AnEnum> setterArg) {
       this.enumList = setterArg;
     }
 
+    private @NonNull List<Object> objectList;
+
+    public @NonNull List<Object> getObjectList() {
+      return objectList;
+    }
+
+    public void setObjectList(@NonNull List<Object> setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"objectList\" is null.");
+      }
+      this.objectList = setterArg;
+    }
+
     private @NonNull List<List<Object>> listList;
 
     public @NonNull List<List<Object>> getListList() {
@@ -465,6 +478,19 @@ public void setEnumMap(@NonNull Map<AnEnum, AnEnum> setterArg) {
       this.enumMap = setterArg;
     }
 
+    private @NonNull Map<Object, Object> objectMap;
+
+    public @NonNull Map<Object, Object> getObjectMap() {
+      return objectMap;
+    }
+
+    public void setObjectMap(@NonNull Map<Object, Object> setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"objectMap\" is null.");
+      }
+      this.objectMap = setterArg;
+    }
+
     /** Constructor is non-public to enforce null safety; use Builder. */
     AllTypes() {}
 
@@ -495,11 +521,13 @@ public boolean equals(Object o) {
           && doubleList.equals(that.doubleList)
           && boolList.equals(that.boolList)
           && enumList.equals(that.enumList)
+          && objectList.equals(that.objectList)
           && listList.equals(that.listList)
           && map.equals(that.map)
           && stringMap.equals(that.stringMap)
           && intMap.equals(that.intMap)
-          && enumMap.equals(that.enumMap);
+          && enumMap.equals(that.enumMap)
+          && objectMap.equals(that.objectMap);
     }
 
     @Override
@@ -520,11 +548,13 @@ public int hashCode() {
               doubleList,
               boolList,
               enumList,
+              objectList,
               listList,
               map,
               stringMap,
               intMap,
-              enumMap);
+              enumMap,
+              objectMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(a4ByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(a8ByteArray);
@@ -678,6 +708,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Object> objectList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectList(@NonNull List<Object> setterArg) {
+        this.objectList = setterArg;
+        return this;
+      }
+
       private @Nullable List<List<Object>> listList;
 
       @CanIgnoreReturnValue
@@ -718,6 +756,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Object, Object> objectMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectMap(@NonNull Map<Object, Object> setterArg) {
+        this.objectMap = setterArg;
+        return this;
+      }
+
       public @NonNull AllTypes build() {
         AllTypes pigeonReturn = new AllTypes();
         pigeonReturn.setABool(aBool);
@@ -738,18 +784,20 @@ public static final class Builder {
         pigeonReturn.setDoubleList(doubleList);
         pigeonReturn.setBoolList(boolList);
         pigeonReturn.setEnumList(enumList);
+        pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
+        pigeonReturn.setObjectMap(objectMap);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(23);
+      ArrayList<Object> toListResult = new ArrayList<>(25);
       toListResult.add(aBool);
       toListResult.add(anInt);
       toListResult.add(anInt64);
@@ -768,11 +816,13 @@ ArrayList<Object> toList() {
       toListResult.add(doubleList);
       toListResult.add(boolList);
       toListResult.add(enumList);
+      toListResult.add(objectList);
       toListResult.add(listList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
+      toListResult.add(objectMap);
       return toListResult;
     }
 
@@ -814,16 +864,20 @@ ArrayList<Object> toList() {
       pigeonResult.setBoolList((List<Boolean>) boolList);
       Object enumList = pigeonVar_list.get(17);
       pigeonResult.setEnumList((List<AnEnum>) enumList);
-      Object listList = pigeonVar_list.get(18);
+      Object objectList = pigeonVar_list.get(18);
+      pigeonResult.setObjectList((List<Object>) objectList);
+      Object listList = pigeonVar_list.get(19);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object map = pigeonVar_list.get(19);
+      Object map = pigeonVar_list.get(20);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(20);
+      Object stringMap = pigeonVar_list.get(21);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(21);
+      Object intMap = pigeonVar_list.get(22);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(22);
+      Object enumMap = pigeonVar_list.get(23);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
+      Object objectMap = pigeonVar_list.get(24);
+      pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
       return pigeonResult;
     }
   }
@@ -1024,6 +1078,16 @@ public void setEnumList(@Nullable List<AnEnum> setterArg) {
       this.enumList = setterArg;
     }
 
+    private @Nullable List<Object> objectList;
+
+    public @Nullable List<Object> getObjectList() {
+      return objectList;
+    }
+
+    public void setObjectList(@Nullable List<Object> setterArg) {
+      this.objectList = setterArg;
+    }
+
     private @Nullable List<List<Object>> listList;
 
     public @Nullable List<List<Object>> getListList() {
@@ -1084,6 +1148,16 @@ public void setEnumMap(@Nullable Map<AnEnum, AnEnum> setterArg) {
       this.enumMap = setterArg;
     }
 
+    private @Nullable Map<Object, Object> objectMap;
+
+    public @Nullable Map<Object, Object> getObjectMap() {
+      return objectMap;
+    }
+
+    public void setObjectMap(@Nullable Map<Object, Object> setterArg) {
+      this.objectMap = setterArg;
+    }
+
     private @Nullable Map<Long, AllNullableTypes> recursiveClassMap;
 
     public @Nullable Map<Long, AllNullableTypes> getRecursiveClassMap() {
@@ -1122,12 +1196,14 @@ public boolean equals(Object o) {
           && Objects.equals(doubleList, that.doubleList)
           && Objects.equals(boolList, that.boolList)
           && Objects.equals(enumList, that.enumList)
+          && Objects.equals(objectList, that.objectList)
           && Objects.equals(listList, that.listList)
           && Objects.equals(recursiveClassList, that.recursiveClassList)
           && Objects.equals(map, that.map)
           && Objects.equals(stringMap, that.stringMap)
           && Objects.equals(intMap, that.intMap)
           && Objects.equals(enumMap, that.enumMap)
+          && Objects.equals(objectMap, that.objectMap)
           && Objects.equals(recursiveClassMap, that.recursiveClassMap);
     }
 
@@ -1150,12 +1226,14 @@ public int hashCode() {
               doubleList,
               boolList,
               enumList,
+              objectList,
               listList,
               recursiveClassList,
               map,
               stringMap,
               intMap,
               enumMap,
+              objectMap,
               recursiveClassMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullableByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable4ByteArray);
@@ -1318,6 +1396,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Object> objectList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectList(@Nullable List<Object> setterArg) {
+        this.objectList = setterArg;
+        return this;
+      }
+
       private @Nullable List<List<Object>> listList;
 
       @CanIgnoreReturnValue
@@ -1366,6 +1452,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Object, Object> objectMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectMap(@Nullable Map<Object, Object> setterArg) {
+        this.objectMap = setterArg;
+        return this;
+      }
+
       private @Nullable Map<Long, AllNullableTypes> recursiveClassMap;
 
       @CanIgnoreReturnValue
@@ -1396,12 +1490,14 @@ public static final class Builder {
         pigeonReturn.setDoubleList(doubleList);
         pigeonReturn.setBoolList(boolList);
         pigeonReturn.setEnumList(enumList);
+        pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
         pigeonReturn.setRecursiveClassList(recursiveClassList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
+        pigeonReturn.setObjectMap(objectMap);
         pigeonReturn.setRecursiveClassMap(recursiveClassMap);
         return pigeonReturn;
       }
@@ -1409,7 +1505,7 @@ public static final class Builder {
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(26);
+      ArrayList<Object> toListResult = new ArrayList<>(28);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
       toListResult.add(aNullableInt64);
@@ -1429,12 +1525,14 @@ ArrayList<Object> toList() {
       toListResult.add(doubleList);
       toListResult.add(boolList);
       toListResult.add(enumList);
+      toListResult.add(objectList);
       toListResult.add(listList);
       toListResult.add(recursiveClassList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
+      toListResult.add(objectMap);
       toListResult.add(recursiveClassMap);
       return toListResult;
     }
@@ -1479,19 +1577,23 @@ ArrayList<Object> toList() {
       pigeonResult.setBoolList((List<Boolean>) boolList);
       Object enumList = pigeonVar_list.get(18);
       pigeonResult.setEnumList((List<AnEnum>) enumList);
-      Object listList = pigeonVar_list.get(19);
+      Object objectList = pigeonVar_list.get(19);
+      pigeonResult.setObjectList((List<Object>) objectList);
+      Object listList = pigeonVar_list.get(20);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object recursiveClassList = pigeonVar_list.get(20);
+      Object recursiveClassList = pigeonVar_list.get(21);
       pigeonResult.setRecursiveClassList((List<AllNullableTypes>) recursiveClassList);
-      Object map = pigeonVar_list.get(21);
+      Object map = pigeonVar_list.get(22);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(22);
+      Object stringMap = pigeonVar_list.get(23);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(23);
+      Object intMap = pigeonVar_list.get(24);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(24);
+      Object enumMap = pigeonVar_list.get(25);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
-      Object recursiveClassMap = pigeonVar_list.get(25);
+      Object objectMap = pigeonVar_list.get(26);
+      pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
+      Object recursiveClassMap = pigeonVar_list.get(27);
       pigeonResult.setRecursiveClassMap((Map<Long, AllNullableTypes>) recursiveClassMap);
       return pigeonResult;
     }
@@ -1684,6 +1786,16 @@ public void setEnumList(@Nullable List<AnEnum> setterArg) {
       this.enumList = setterArg;
     }
 
+    private @Nullable List<Object> objectList;
+
+    public @Nullable List<Object> getObjectList() {
+      return objectList;
+    }
+
+    public void setObjectList(@Nullable List<Object> setterArg) {
+      this.objectList = setterArg;
+    }
+
     private @Nullable List<List<Object>> listList;
 
     public @Nullable List<List<Object>> getListList() {
@@ -1734,6 +1846,16 @@ public void setEnumMap(@Nullable Map<AnEnum, AnEnum> setterArg) {
       this.enumMap = setterArg;
     }
 
+    private @Nullable Map<Object, Object> objectMap;
+
+    public @Nullable Map<Object, Object> getObjectMap() {
+      return objectMap;
+    }
+
+    public void setObjectMap(@Nullable Map<Object, Object> setterArg) {
+      this.objectMap = setterArg;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -1761,11 +1883,13 @@ public boolean equals(Object o) {
           && Objects.equals(doubleList, that.doubleList)
           && Objects.equals(boolList, that.boolList)
           && Objects.equals(enumList, that.enumList)
+          && Objects.equals(objectList, that.objectList)
           && Objects.equals(listList, that.listList)
           && Objects.equals(map, that.map)
           && Objects.equals(stringMap, that.stringMap)
           && Objects.equals(intMap, that.intMap)
-          && Objects.equals(enumMap, that.enumMap);
+          && Objects.equals(enumMap, that.enumMap)
+          && Objects.equals(objectMap, that.objectMap);
     }
 
     @Override
@@ -1786,11 +1910,13 @@ public int hashCode() {
               doubleList,
               boolList,
               enumList,
+              objectList,
               listList,
               map,
               stringMap,
               intMap,
-              enumMap);
+              enumMap,
+              objectMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullableByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable4ByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable8ByteArray);
@@ -1944,6 +2070,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Object> objectList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectList(@Nullable List<Object> setterArg) {
+        this.objectList = setterArg;
+        return this;
+      }
+
       private @Nullable List<List<Object>> listList;
 
       @CanIgnoreReturnValue
@@ -1984,6 +2118,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Object, Object> objectMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setObjectMap(@Nullable Map<Object, Object> setterArg) {
+        this.objectMap = setterArg;
+        return this;
+      }
+
       public @NonNull AllNullableTypesWithoutRecursion build() {
         AllNullableTypesWithoutRecursion pigeonReturn = new AllNullableTypesWithoutRecursion();
         pigeonReturn.setANullableBool(aNullableBool);
@@ -2004,18 +2146,20 @@ public static final class Builder {
         pigeonReturn.setDoubleList(doubleList);
         pigeonReturn.setBoolList(boolList);
         pigeonReturn.setEnumList(enumList);
+        pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
+        pigeonReturn.setObjectMap(objectMap);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(23);
+      ArrayList<Object> toListResult = new ArrayList<>(25);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
       toListResult.add(aNullableInt64);
@@ -2034,11 +2178,13 @@ ArrayList<Object> toList() {
       toListResult.add(doubleList);
       toListResult.add(boolList);
       toListResult.add(enumList);
+      toListResult.add(objectList);
       toListResult.add(listList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
+      toListResult.add(objectMap);
       return toListResult;
     }
 
@@ -2081,16 +2227,20 @@ ArrayList<Object> toList() {
       pigeonResult.setBoolList((List<Boolean>) boolList);
       Object enumList = pigeonVar_list.get(17);
       pigeonResult.setEnumList((List<AnEnum>) enumList);
-      Object listList = pigeonVar_list.get(18);
+      Object objectList = pigeonVar_list.get(18);
+      pigeonResult.setObjectList((List<Object>) objectList);
+      Object listList = pigeonVar_list.get(19);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object map = pigeonVar_list.get(19);
+      Object map = pigeonVar_list.get(20);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(20);
+      Object stringMap = pigeonVar_list.get(21);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(21);
+      Object intMap = pigeonVar_list.get(22);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(22);
+      Object enumMap = pigeonVar_list.get(23);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
+      Object objectMap = pigeonVar_list.get(24);
+      pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
       return pigeonResult;
     }
   }
@@ -2533,6 +2683,12 @@ public interface HostIntegrationCoreApi {
     /** Returns the passed list, to test serialization and deserialization. */
     @NonNull
     List<AllNullableTypes> echoClassList(@NonNull List<AllNullableTypes> classList);
+    /** Returns the passed list, to test serialization and deserialization. */
+    @NonNull
+    List<AnEnum> echoNonNullEnumList(@NonNull List<AnEnum> enumList);
+    /** Returns the passed list, to test serialization and deserialization. */
+    @NonNull
+    List<AllNullableTypes> echoNonNullClassList(@NonNull List<AllNullableTypes> classList);
     /** Returns the passed map, to test serialization and deserialization. */
     @NonNull
     Map<Object, Object> echoMap(@NonNull Map<Object, Object> map);
@@ -2548,6 +2704,18 @@ public interface HostIntegrationCoreApi {
     /** Returns the passed map, to test serialization and deserialization. */
     @NonNull
     Map<Long, AllNullableTypes> echoClassMap(@NonNull Map<Long, AllNullableTypes> classMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @NonNull
+    Map<String, String> echoNonNullStringMap(@NonNull Map<String, String> stringMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @NonNull
+    Map<Long, Long> echoNonNullIntMap(@NonNull Map<Long, Long> intMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @NonNull
+    Map<AnEnum, AnEnum> echoNonNullEnumMap(@NonNull Map<AnEnum, AnEnum> enumMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @NonNull
+    Map<Long, AllNullableTypes> echoNonNullClassMap(@NonNull Map<Long, AllNullableTypes> classMap);
     /** Returns the passed class to test nested class serialization and deserialization. */
     @NonNull
     AllClassesWrapper echoClassWrapper(@NonNull AllClassesWrapper wrapper);
@@ -2622,6 +2790,12 @@ AllNullableTypesWithoutRecursion sendMultipleNullableTypesWithoutRecursion(
     /** Returns the passed list, to test serialization and deserialization. */
     @Nullable
     List<AllNullableTypes> echoNullableClassList(@Nullable List<AllNullableTypes> classList);
+    /** Returns the passed list, to test serialization and deserialization. */
+    @Nullable
+    List<AnEnum> echoNullableNonNullEnumList(@Nullable List<AnEnum> enumList);
+    /** Returns the passed list, to test serialization and deserialization. */
+    @Nullable
+    List<AllNullableTypes> echoNullableNonNullClassList(@Nullable List<AllNullableTypes> classList);
     /** Returns the passed map, to test serialization and deserialization. */
     @Nullable
     Map<Object, Object> echoNullableMap(@Nullable Map<Object, Object> map);
@@ -2638,6 +2812,19 @@ AllNullableTypesWithoutRecursion sendMultipleNullableTypesWithoutRecursion(
     @Nullable
     Map<Long, AllNullableTypes> echoNullableClassMap(
         @Nullable Map<Long, AllNullableTypes> classMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @Nullable
+    Map<String, String> echoNullableNonNullStringMap(@Nullable Map<String, String> stringMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @Nullable
+    Map<Long, Long> echoNullableNonNullIntMap(@Nullable Map<Long, Long> intMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @Nullable
+    Map<AnEnum, AnEnum> echoNullableNonNullEnumMap(@Nullable Map<AnEnum, AnEnum> enumMap);
+    /** Returns the passed map, to test serialization and deserialization. */
+    @Nullable
+    Map<Long, AllNullableTypes> echoNullableNonNullClassMap(
+        @Nullable Map<Long, AllNullableTypes> classMap);
 
     @Nullable
     AnEnum echoNullableEnum(@Nullable AnEnum anEnum);
@@ -2800,6 +2987,12 @@ void callFlutterEchoEnumList(
     void callFlutterEchoClassList(
         @NonNull List<AllNullableTypes> classList, @NonNull Result<List<AllNullableTypes>> result);
 
+    void callFlutterEchoNonNullEnumList(
+        @NonNull List<AnEnum> enumList, @NonNull Result<List<AnEnum>> result);
+
+    void callFlutterEchoNonNullClassList(
+        @NonNull List<AllNullableTypes> classList, @NonNull Result<List<AllNullableTypes>> result);
+
     void callFlutterEchoMap(
         @NonNull Map<Object, Object> map, @NonNull Result<Map<Object, Object>> result);
 
@@ -2816,6 +3009,19 @@ void callFlutterEchoClassMap(
         @NonNull Map<Long, AllNullableTypes> classMap,
         @NonNull Result<Map<Long, AllNullableTypes>> result);
 
+    void callFlutterEchoNonNullStringMap(
+        @NonNull Map<String, String> stringMap, @NonNull Result<Map<String, String>> result);
+
+    void callFlutterEchoNonNullIntMap(
+        @NonNull Map<Long, Long> intMap, @NonNull Result<Map<Long, Long>> result);
+
+    void callFlutterEchoNonNullEnumMap(
+        @NonNull Map<AnEnum, AnEnum> enumMap, @NonNull Result<Map<AnEnum, AnEnum>> result);
+
+    void callFlutterEchoNonNullClassMap(
+        @NonNull Map<Long, AllNullableTypes> classMap,
+        @NonNull Result<Map<Long, AllNullableTypes>> result);
+
     void callFlutterEchoEnum(@NonNull AnEnum anEnum, @NonNull Result<AnEnum> result);
 
     void callFlutterEchoAnotherEnum(
@@ -2845,6 +3051,13 @@ void callFlutterEchoNullableClassList(
         @Nullable List<AllNullableTypes> classList,
         @NonNull NullableResult<List<AllNullableTypes>> result);
 
+    void callFlutterEchoNullableNonNullEnumList(
+        @Nullable List<AnEnum> enumList, @NonNull NullableResult<List<AnEnum>> result);
+
+    void callFlutterEchoNullableNonNullClassList(
+        @Nullable List<AllNullableTypes> classList,
+        @NonNull NullableResult<List<AllNullableTypes>> result);
+
     void callFlutterEchoNullableMap(
         @Nullable Map<Object, Object> map, @NonNull NullableResult<Map<Object, Object>> result);
 
@@ -2862,6 +3075,20 @@ void callFlutterEchoNullableClassMap(
         @Nullable Map<Long, AllNullableTypes> classMap,
         @NonNull NullableResult<Map<Long, AllNullableTypes>> result);
 
+    void callFlutterEchoNullableNonNullStringMap(
+        @Nullable Map<String, String> stringMap,
+        @NonNull NullableResult<Map<String, String>> result);
+
+    void callFlutterEchoNullableNonNullIntMap(
+        @Nullable Map<Long, Long> intMap, @NonNull NullableResult<Map<Long, Long>> result);
+
+    void callFlutterEchoNullableNonNullEnumMap(
+        @Nullable Map<AnEnum, AnEnum> enumMap, @NonNull NullableResult<Map<AnEnum, AnEnum>> result);
+
+    void callFlutterEchoNullableNonNullClassMap(
+        @Nullable Map<Long, AllNullableTypes> classMap,
+        @NonNull NullableResult<Map<Long, AllNullableTypes>> result);
+
     void callFlutterEchoNullableEnum(
         @Nullable AnEnum anEnum, @NonNull NullableResult<AnEnum> result);
 
@@ -3234,7 +3461,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3242,9 +3469,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
                 try {
-                  Map<Object, Object> output = api.echoMap(mapArg);
+                  List<AnEnum> output = api.echoNonNullEnumList(enumListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3259,7 +3486,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3267,9 +3494,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
                 try {
-                  Map<String, String> output = api.echoStringMap(stringMapArg);
+                  List<AllNullableTypes> output = api.echoNonNullClassList(classListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3284,7 +3511,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3292,9 +3519,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
                 try {
-                  Map<Long, Long> output = api.echoIntMap(intMapArg);
+                  Map<Object, Object> output = api.echoMap(mapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3309,7 +3536,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3317,9 +3544,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
                 try {
-                  Map<AnEnum, AnEnum> output = api.echoEnumMap(enumMapArg);
+                  Map<String, String> output = api.echoStringMap(stringMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3334,7 +3561,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3342,9 +3569,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
                 try {
-                  Map<Long, AllNullableTypes> output = api.echoClassMap(classMapArg);
+                  Map<Long, Long> output = api.echoIntMap(intMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3359,7 +3586,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3367,9 +3594,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllClassesWrapper wrapperArg = (AllClassesWrapper) args.get(0);
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
                 try {
-                  AllClassesWrapper output = api.echoClassWrapper(wrapperArg);
+                  Map<AnEnum, AnEnum> output = api.echoEnumMap(enumMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3384,7 +3611,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3392,9 +3619,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnEnum anEnumArg = (AnEnum) args.get(0);
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
                 try {
-                  AnEnum output = api.echoEnum(anEnumArg);
+                  Map<Long, AllNullableTypes> output = api.echoClassMap(classMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3409,7 +3636,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3417,9 +3644,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
                 try {
-                  AnotherEnum output = api.echoAnotherEnum(anotherEnumArg);
+                  Map<String, String> output = api.echoNonNullStringMap(stringMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3434,7 +3661,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3442,9 +3669,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aStringArg = (String) args.get(0);
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
                 try {
-                  String output = api.echoNamedDefaultString(aStringArg);
+                  Map<Long, Long> output = api.echoNonNullIntMap(intMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3459,7 +3686,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3467,9 +3694,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aDoubleArg = (Double) args.get(0);
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
                 try {
-                  Double output = api.echoOptionalDefaultDouble(aDoubleArg);
+                  Map<AnEnum, AnEnum> output = api.echoNonNullEnumMap(enumMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3484,7 +3711,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3492,9 +3719,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long anIntArg = (Long) args.get(0);
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
                 try {
-                  Long output = api.echoRequiredInt(anIntArg);
+                  Map<Long, AllNullableTypes> output = api.echoNonNullClassMap(classMapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3509,7 +3736,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3517,9 +3744,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
+                AllClassesWrapper wrapperArg = (AllClassesWrapper) args.get(0);
                 try {
-                  AllNullableTypes output = api.echoAllNullableTypes(everythingArg);
+                  AllClassesWrapper output = api.echoClassWrapper(wrapperArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3534,7 +3761,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3542,11 +3769,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypesWithoutRecursion everythingArg =
-                    (AllNullableTypesWithoutRecursion) args.get(0);
+                AnEnum anEnumArg = (AnEnum) args.get(0);
                 try {
-                  AllNullableTypesWithoutRecursion output =
-                      api.echoAllNullableTypesWithoutRecursion(everythingArg);
+                  AnEnum output = api.echoEnum(anEnumArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3561,7 +3786,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3569,9 +3794,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllClassesWrapper wrapperArg = (AllClassesWrapper) args.get(0);
+                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
                 try {
-                  String output = api.extractNestedNullableString(wrapperArg);
+                  AnotherEnum output = api.echoAnotherEnum(anotherEnumArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3586,7 +3811,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3594,9 +3819,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String nullableStringArg = (String) args.get(0);
+                String aStringArg = (String) args.get(0);
                 try {
-                  AllClassesWrapper output = api.createNestedNullableString(nullableStringArg);
+                  String output = api.echoNamedDefaultString(aStringArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3611,7 +3836,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3619,13 +3844,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aNullableBoolArg = (Boolean) args.get(0);
-                Long aNullableIntArg = (Long) args.get(1);
-                String aNullableStringArg = (String) args.get(2);
+                Double aDoubleArg = (Double) args.get(0);
                 try {
-                  AllNullableTypes output =
-                      api.sendMultipleNullableTypes(
-                          aNullableBoolArg, aNullableIntArg, aNullableStringArg);
+                  Double output = api.echoOptionalDefaultDouble(aDoubleArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3640,7 +3861,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3648,13 +3869,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aNullableBoolArg = (Boolean) args.get(0);
-                Long aNullableIntArg = (Long) args.get(1);
-                String aNullableStringArg = (String) args.get(2);
+                Long anIntArg = (Long) args.get(0);
                 try {
-                  AllNullableTypesWithoutRecursion output =
-                      api.sendMultipleNullableTypesWithoutRecursion(
-                          aNullableBoolArg, aNullableIntArg, aNullableStringArg);
+                  Long output = api.echoRequiredInt(anIntArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3669,7 +3886,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3677,9 +3894,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long aNullableIntArg = (Long) args.get(0);
+                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
                 try {
-                  Long output = api.echoNullableInt(aNullableIntArg);
+                  AllNullableTypes output = api.echoAllNullableTypes(everythingArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3694,7 +3911,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3702,9 +3919,11 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aNullableDoubleArg = (Double) args.get(0);
+                AllNullableTypesWithoutRecursion everythingArg =
+                    (AllNullableTypesWithoutRecursion) args.get(0);
                 try {
-                  Double output = api.echoNullableDouble(aNullableDoubleArg);
+                  AllNullableTypesWithoutRecursion output =
+                      api.echoAllNullableTypesWithoutRecursion(everythingArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3719,7 +3938,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3727,9 +3946,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aNullableBoolArg = (Boolean) args.get(0);
+                AllClassesWrapper wrapperArg = (AllClassesWrapper) args.get(0);
                 try {
-                  Boolean output = api.echoNullableBool(aNullableBoolArg);
+                  String output = api.extractNestedNullableString(wrapperArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3744,7 +3963,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3752,9 +3971,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aNullableStringArg = (String) args.get(0);
+                String nullableStringArg = (String) args.get(0);
                 try {
-                  String output = api.echoNullableString(aNullableStringArg);
+                  AllClassesWrapper output = api.createNestedNullableString(nullableStringArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3769,7 +3988,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3777,9 +3996,13 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                byte[] aNullableUint8ListArg = (byte[]) args.get(0);
+                Boolean aNullableBoolArg = (Boolean) args.get(0);
+                Long aNullableIntArg = (Long) args.get(1);
+                String aNullableStringArg = (String) args.get(2);
                 try {
-                  byte[] output = api.echoNullableUint8List(aNullableUint8ListArg);
+                  AllNullableTypes output =
+                      api.sendMultipleNullableTypes(
+                          aNullableBoolArg, aNullableIntArg, aNullableStringArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3794,7 +4017,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3802,9 +4025,13 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Object aNullableObjectArg = args.get(0);
+                Boolean aNullableBoolArg = (Boolean) args.get(0);
+                Long aNullableIntArg = (Long) args.get(1);
+                String aNullableStringArg = (String) args.get(2);
                 try {
-                  Object output = api.echoNullableObject(aNullableObjectArg);
+                  AllNullableTypesWithoutRecursion output =
+                      api.sendMultipleNullableTypesWithoutRecursion(
+                          aNullableBoolArg, aNullableIntArg, aNullableStringArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3819,7 +4046,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3827,9 +4054,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<Object> aNullableListArg = (List<Object>) args.get(0);
+                Long aNullableIntArg = (Long) args.get(0);
                 try {
-                  List<Object> output = api.echoNullableList(aNullableListArg);
+                  Long output = api.echoNullableInt(aNullableIntArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3844,7 +4071,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnumList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3852,9 +4079,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                Double aNullableDoubleArg = (Double) args.get(0);
                 try {
-                  List<AnEnum> output = api.echoNullableEnumList(enumListArg);
+                  Double output = api.echoNullableDouble(aNullableDoubleArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3869,7 +4096,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableClassList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3877,9 +4104,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                Boolean aNullableBoolArg = (Boolean) args.get(0);
                 try {
-                  List<AllNullableTypes> output = api.echoNullableClassList(classListArg);
+                  Boolean output = api.echoNullableBool(aNullableBoolArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3894,7 +4121,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3902,9 +4129,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                String aNullableStringArg = (String) args.get(0);
                 try {
-                  Map<Object, Object> output = api.echoNullableMap(mapArg);
+                  String output = api.echoNullableString(aNullableStringArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3919,7 +4146,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3927,9 +4154,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                byte[] aNullableUint8ListArg = (byte[]) args.get(0);
                 try {
-                  Map<String, String> output = api.echoNullableStringMap(stringMapArg);
+                  byte[] output = api.echoNullableUint8List(aNullableUint8ListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3944,7 +4171,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3952,9 +4179,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                Object aNullableObjectArg = args.get(0);
                 try {
-                  Map<Long, Long> output = api.echoNullableIntMap(intMapArg);
+                  Object output = api.echoNullableObject(aNullableObjectArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3969,7 +4196,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -3977,9 +4204,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                List<Object> aNullableListArg = (List<Object>) args.get(0);
                 try {
-                  Map<AnEnum, AnEnum> output = api.echoNullableEnumMap(enumMapArg);
+                  List<Object> output = api.echoNullableList(aNullableListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -3994,7 +4221,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4002,9 +4229,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
                 try {
-                  Map<Long, AllNullableTypes> output = api.echoNullableClassMap(classMapArg);
+                  List<AnEnum> output = api.echoNullableEnumList(enumListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -4019,7 +4246,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4027,9 +4254,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnEnum anEnumArg = (AnEnum) args.get(0);
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
                 try {
-                  AnEnum output = api.echoNullableEnum(anEnumArg);
+                  List<AllNullableTypes> output = api.echoNullableClassList(classListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -4044,7 +4271,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4052,9 +4279,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
                 try {
-                  AnotherEnum output = api.echoAnotherNullableEnum(anotherEnumArg);
+                  List<AnEnum> output = api.echoNullableNonNullEnumList(enumListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -4069,7 +4296,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4077,9 +4304,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long aNullableIntArg = (Long) args.get(0);
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
                 try {
-                  Long output = api.echoOptionalNullableInt(aNullableIntArg);
+                  List<AllNullableTypes> output = api.echoNullableNonNullClassList(classListArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -4094,7 +4321,7 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4102,9 +4329,9 @@ static void setUp(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aNullableStringArg = (String) args.get(0);
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
                 try {
-                  String output = api.echoNamedNullableString(aNullableStringArg);
+                  Map<Object, Object> output = api.echoNullableMap(mapArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
@@ -4119,27 +4346,22 @@ static void setUp(
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                VoidResult resultCallback =
-                    new VoidResult() {
-                      public void success() {
-                        wrapped.add(0, null);
-                        reply.reply(wrapped);
-                      }
-
-                      public void error(Throwable error) {
-                        ArrayList<Object> wrappedError = wrapError(error);
-                        reply.reply(wrappedError);
-                      }
-                    };
-
-                api.noopAsync(resultCallback);
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                try {
+                  Map<String, String> output = api.echoNullableStringMap(stringMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4149,7 +4371,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4157,21 +4379,14 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long anIntArg = (Long) args.get(0);
-                Result<Long> resultCallback =
-                    new Result<Long>() {
-                      public void success(Long result) {
-                        wrapped.add(0, result);
-                        reply.reply(wrapped);
-                      }
-
-                      public void error(Throwable error) {
-                        ArrayList<Object> wrappedError = wrapError(error);
-                        reply.reply(wrappedError);
-                      }
-                    };
-
-                api.echoAsyncInt(anIntArg, resultCallback);
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                try {
+                  Map<Long, Long> output = api.echoNullableIntMap(intMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4181,7 +4396,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4189,21 +4404,14 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aDoubleArg = (Double) args.get(0);
-                Result<Double> resultCallback =
-                    new Result<Double>() {
-                      public void success(Double result) {
-                        wrapped.add(0, result);
-                        reply.reply(wrapped);
-                      }
-
-                      public void error(Throwable error) {
-                        ArrayList<Object> wrappedError = wrapError(error);
-                        reply.reply(wrappedError);
-                      }
-                    };
-
-                api.echoAsyncDouble(aDoubleArg, resultCallback);
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                try {
+                  Map<AnEnum, AnEnum> output = api.echoNullableEnumMap(enumMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4213,7 +4421,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4221,10 +4429,713 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aBoolArg = (Boolean) args.get(0);
-                Result<Boolean> resultCallback =
-                    new Result<Boolean>() {
-                      public void success(Boolean result) {
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                try {
+                  Map<Long, AllNullableTypes> output = api.echoNullableClassMap(classMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullStringMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                try {
+                  Map<String, String> output = api.echoNullableNonNullStringMap(stringMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullIntMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                try {
+                  Map<Long, Long> output = api.echoNullableNonNullIntMap(intMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                try {
+                  Map<AnEnum, AnEnum> output = api.echoNullableNonNullEnumMap(enumMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                try {
+                  Map<Long, AllNullableTypes> output = api.echoNullableNonNullClassMap(classMapArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                AnEnum anEnumArg = (AnEnum) args.get(0);
+                try {
+                  AnEnum output = api.echoNullableEnum(anEnumArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                try {
+                  AnotherEnum output = api.echoAnotherNullableEnum(anotherEnumArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Long aNullableIntArg = (Long) args.get(0);
+                try {
+                  Long output = api.echoOptionalNullableInt(aNullableIntArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                String aNullableStringArg = (String) args.get(0);
+                try {
+                  String output = api.echoNamedNullableString(aNullableStringArg);
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  wrapped = wrapError(exception);
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                VoidResult resultCallback =
+                    new VoidResult() {
+                      public void success() {
+                        wrapped.add(0, null);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.noopAsync(resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Long anIntArg = (Long) args.get(0);
+                Result<Long> resultCallback =
+                    new Result<Long>() {
+                      public void success(Long result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncInt(anIntArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Double aDoubleArg = (Double) args.get(0);
+                Result<Double> resultCallback =
+                    new Result<Double>() {
+                      public void success(Double result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncDouble(aDoubleArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Boolean aBoolArg = (Boolean) args.get(0);
+                Result<Boolean> resultCallback =
+                    new Result<Boolean>() {
+                      public void success(Boolean result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncBool(aBoolArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                String aStringArg = (String) args.get(0);
+                Result<String> resultCallback =
+                    new Result<String>() {
+                      public void success(String result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncString(aStringArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                byte[] aUint8ListArg = (byte[]) args.get(0);
+                Result<byte[]> resultCallback =
+                    new Result<byte[]>() {
+                      public void success(byte[] result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncUint8List(aUint8ListArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Object anObjectArg = args.get(0);
+                Result<Object> resultCallback =
+                    new Result<Object>() {
+                      public void success(Object result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncObject(anObjectArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<Object> listArg = (List<Object>) args.get(0);
+                Result<List<Object>> resultCallback =
+                    new Result<List<Object>>() {
+                      public void success(List<Object> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncList(listArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnumList"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                Result<List<AnEnum>> resultCallback =
+                    new Result<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncEnumList(enumListArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncClassList"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                Result<List<AllNullableTypes>> resultCallback =
+                    new Result<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncClassList(classListArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                Result<Map<Object, Object>> resultCallback =
+                    new Result<Map<Object, Object>>() {
+                      public void success(Map<Object, Object> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncMap(mapArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncStringMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                Result<Map<String, String>> resultCallback =
+                    new Result<Map<String, String>>() {
+                      public void success(Map<String, String> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncStringMap(stringMapArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncIntMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                Result<Map<Long, Long>> resultCallback =
+                    new Result<Map<Long, Long>>() {
+                      public void success(Map<Long, Long> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncIntMap(intMapArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnumMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                Result<Map<AnEnum, AnEnum>> resultCallback =
+                    new Result<Map<AnEnum, AnEnum>>() {
+                      public void success(Map<AnEnum, AnEnum> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncEnumMap(enumMapArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncClassMap"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                Result<Map<Long, AllNullableTypes>> resultCallback =
+                    new Result<Map<Long, AllNullableTypes>>() {
+                      public void success(Map<Long, AllNullableTypes> result) {
+                        wrapped.add(0, result);
+                        reply.reply(wrapped);
+                      }
+
+                      public void error(Throwable error) {
+                        ArrayList<Object> wrappedError = wrapError(error);
+                        reply.reply(wrappedError);
+                      }
+                    };
+
+                api.echoAsyncClassMap(classMapArg, resultCallback);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum"
+                    + messageChannelSuffix,
+                getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                AnEnum anEnumArg = (AnEnum) args.get(0);
+                Result<AnEnum> resultCallback =
+                    new Result<AnEnum>() {
+                      public void success(AnEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4235,7 +5146,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncBool(aBoolArg, resultCallback);
+                api.echoAsyncEnum(anEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4245,7 +5156,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherAsyncEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4253,10 +5164,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aStringArg = (String) args.get(0);
-                Result<String> resultCallback =
-                    new Result<String>() {
-                      public void success(String result) {
+                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                Result<AnotherEnum> resultCallback =
+                    new Result<AnotherEnum>() {
+                      public void success(AnotherEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4267,7 +5178,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncString(aStringArg, resultCallback);
+                api.echoAnotherAsyncEnum(anotherEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4277,18 +5188,16 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                byte[] aUint8ListArg = (byte[]) args.get(0);
-                Result<byte[]> resultCallback =
-                    new Result<byte[]>() {
-                      public void success(byte[] result) {
+                NullableResult<Object> resultCallback =
+                    new NullableResult<Object>() {
+                      public void success(Object result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4299,7 +5208,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncUint8List(aUint8ListArg, resultCallback);
+                api.throwAsyncError(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4309,19 +5218,17 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                Object anObjectArg = args.get(0);
-                Result<Object> resultCallback =
-                    new Result<Object>() {
-                      public void success(Object result) {
-                        wrapped.add(0, result);
+                VoidResult resultCallback =
+                    new VoidResult() {
+                      public void success() {
+                        wrapped.add(0, null);
                         reply.reply(wrapped);
                       }
 
@@ -4331,7 +5238,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncObject(anObjectArg, resultCallback);
+                api.throwAsyncErrorFromVoid(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4341,18 +5248,16 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                List<Object> listArg = (List<Object>) args.get(0);
-                Result<List<Object>> resultCallback =
-                    new Result<List<Object>>() {
-                      public void success(List<Object> result) {
+                NullableResult<Object> resultCallback =
+                    new NullableResult<Object>() {
+                      public void success(Object result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4363,7 +5268,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncList(listArg, resultCallback);
+                api.throwAsyncFlutterError(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4373,7 +5278,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnumList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4381,10 +5286,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
-                Result<List<AnEnum>> resultCallback =
-                    new Result<List<AnEnum>>() {
-                      public void success(List<AnEnum> result) {
+                AllTypes everythingArg = (AllTypes) args.get(0);
+                Result<AllTypes> resultCallback =
+                    new Result<AllTypes>() {
+                      public void success(AllTypes result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4395,7 +5300,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncEnumList(enumListArg, resultCallback);
+                api.echoAsyncAllTypes(everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4405,7 +5310,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncClassList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4413,10 +5318,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
-                Result<List<AllNullableTypes>> resultCallback =
-                    new Result<List<AllNullableTypes>>() {
-                      public void success(List<AllNullableTypes> result) {
+                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
+                NullableResult<AllNullableTypes> resultCallback =
+                    new NullableResult<AllNullableTypes>() {
+                      public void success(AllNullableTypes result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4427,7 +5332,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncClassList(classListArg, resultCallback);
+                api.echoAsyncNullableAllNullableTypes(everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4437,7 +5342,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4445,10 +5350,11 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
-                Result<Map<Object, Object>> resultCallback =
-                    new Result<Map<Object, Object>>() {
-                      public void success(Map<Object, Object> result) {
+                AllNullableTypesWithoutRecursion everythingArg =
+                    (AllNullableTypesWithoutRecursion) args.get(0);
+                NullableResult<AllNullableTypesWithoutRecursion> resultCallback =
+                    new NullableResult<AllNullableTypesWithoutRecursion>() {
+                      public void success(AllNullableTypesWithoutRecursion result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4459,7 +5365,8 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncMap(mapArg, resultCallback);
+                api.echoAsyncNullableAllNullableTypesWithoutRecursion(
+                    everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4469,7 +5376,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4477,10 +5384,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
-                Result<Map<String, String>> resultCallback =
-                    new Result<Map<String, String>>() {
-                      public void success(Map<String, String> result) {
+                Long anIntArg = (Long) args.get(0);
+                NullableResult<Long> resultCallback =
+                    new NullableResult<Long>() {
+                      public void success(Long result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4491,7 +5398,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncStringMap(stringMapArg, resultCallback);
+                api.echoAsyncNullableInt(anIntArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4501,7 +5408,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4509,10 +5416,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
-                Result<Map<Long, Long>> resultCallback =
-                    new Result<Map<Long, Long>>() {
-                      public void success(Map<Long, Long> result) {
+                Double aDoubleArg = (Double) args.get(0);
+                NullableResult<Double> resultCallback =
+                    new NullableResult<Double>() {
+                      public void success(Double result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4523,7 +5430,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncIntMap(intMapArg, resultCallback);
+                api.echoAsyncNullableDouble(aDoubleArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4533,7 +5440,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4541,10 +5448,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
-                Result<Map<AnEnum, AnEnum>> resultCallback =
-                    new Result<Map<AnEnum, AnEnum>>() {
-                      public void success(Map<AnEnum, AnEnum> result) {
+                Boolean aBoolArg = (Boolean) args.get(0);
+                NullableResult<Boolean> resultCallback =
+                    new NullableResult<Boolean>() {
+                      public void success(Boolean result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4555,7 +5462,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncEnumMap(enumMapArg, resultCallback);
+                api.echoAsyncNullableBool(aBoolArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4565,7 +5472,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4573,10 +5480,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
-                Result<Map<Long, AllNullableTypes>> resultCallback =
-                    new Result<Map<Long, AllNullableTypes>>() {
-                      public void success(Map<Long, AllNullableTypes> result) {
+                String aStringArg = (String) args.get(0);
+                NullableResult<String> resultCallback =
+                    new NullableResult<String>() {
+                      public void success(String result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4587,7 +5494,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncClassMap(classMapArg, resultCallback);
+                api.echoAsyncNullableString(aStringArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4597,7 +5504,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4605,10 +5512,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnEnum anEnumArg = (AnEnum) args.get(0);
-                Result<AnEnum> resultCallback =
-                    new Result<AnEnum>() {
-                      public void success(AnEnum result) {
+                byte[] aUint8ListArg = (byte[]) args.get(0);
+                NullableResult<byte[]> resultCallback =
+                    new NullableResult<byte[]>() {
+                      public void success(byte[] result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4619,7 +5526,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncEnum(anEnumArg, resultCallback);
+                api.echoAsyncNullableUint8List(aUint8ListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4629,7 +5536,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherAsyncEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4637,10 +5544,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
-                Result<AnotherEnum> resultCallback =
-                    new Result<AnotherEnum>() {
-                      public void success(AnotherEnum result) {
+                Object anObjectArg = args.get(0);
+                NullableResult<Object> resultCallback =
+                    new NullableResult<Object>() {
+                      public void success(Object result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4651,7 +5558,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAnotherAsyncEnum(anotherEnumArg, resultCallback);
+                api.echoAsyncNullableObject(anObjectArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4661,16 +5568,18 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                NullableResult<Object> resultCallback =
-                    new NullableResult<Object>() {
-                      public void success(Object result) {
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<Object> listArg = (List<Object>) args.get(0);
+                NullableResult<List<Object>> resultCallback =
+                    new NullableResult<List<Object>>() {
+                      public void success(List<Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4681,7 +5590,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.throwAsyncError(resultCallback);
+                api.echoAsyncNullableList(listArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4691,17 +5600,19 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                VoidResult resultCallback =
-                    new VoidResult() {
-                      public void success() {
-                        wrapped.add(0, null);
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                NullableResult<List<AnEnum>> resultCallback =
+                    new NullableResult<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
+                        wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
 
@@ -4711,7 +5622,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.throwAsyncErrorFromVoid(resultCallback);
+                api.echoAsyncNullableEnumList(enumListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4721,16 +5632,18 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                NullableResult<Object> resultCallback =
-                    new NullableResult<Object>() {
-                      public void success(Object result) {
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                NullableResult<List<AllNullableTypes>> resultCallback =
+                    new NullableResult<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4741,7 +5654,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.throwAsyncFlutterError(resultCallback);
+                api.echoAsyncNullableClassList(classListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4751,7 +5664,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4759,10 +5672,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllTypes everythingArg = (AllTypes) args.get(0);
-                Result<AllTypes> resultCallback =
-                    new Result<AllTypes>() {
-                      public void success(AllTypes result) {
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                NullableResult<Map<Object, Object>> resultCallback =
+                    new NullableResult<Map<Object, Object>>() {
+                      public void success(Map<Object, Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4773,7 +5686,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncAllTypes(everythingArg, resultCallback);
+                api.echoAsyncNullableMap(mapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4783,7 +5696,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4791,10 +5704,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
-                NullableResult<AllNullableTypes> resultCallback =
-                    new NullableResult<AllNullableTypes>() {
-                      public void success(AllNullableTypes result) {
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                NullableResult<Map<String, String>> resultCallback =
+                    new NullableResult<Map<String, String>>() {
+                      public void success(Map<String, String> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4805,7 +5718,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableAllNullableTypes(everythingArg, resultCallback);
+                api.echoAsyncNullableStringMap(stringMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4815,7 +5728,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4823,11 +5736,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypesWithoutRecursion everythingArg =
-                    (AllNullableTypesWithoutRecursion) args.get(0);
-                NullableResult<AllNullableTypesWithoutRecursion> resultCallback =
-                    new NullableResult<AllNullableTypesWithoutRecursion>() {
-                      public void success(AllNullableTypesWithoutRecursion result) {
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                NullableResult<Map<Long, Long>> resultCallback =
+                    new NullableResult<Map<Long, Long>>() {
+                      public void success(Map<Long, Long> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4838,8 +5750,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableAllNullableTypesWithoutRecursion(
-                    everythingArg, resultCallback);
+                api.echoAsyncNullableIntMap(intMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4849,7 +5760,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4857,10 +5768,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long anIntArg = (Long) args.get(0);
-                NullableResult<Long> resultCallback =
-                    new NullableResult<Long>() {
-                      public void success(Long result) {
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                NullableResult<Map<AnEnum, AnEnum>> resultCallback =
+                    new NullableResult<Map<AnEnum, AnEnum>>() {
+                      public void success(Map<AnEnum, AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4871,7 +5782,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableInt(anIntArg, resultCallback);
+                api.echoAsyncNullableEnumMap(enumMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4881,7 +5792,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4889,10 +5800,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aDoubleArg = (Double) args.get(0);
-                NullableResult<Double> resultCallback =
-                    new NullableResult<Double>() {
-                      public void success(Double result) {
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                NullableResult<Map<Long, AllNullableTypes>> resultCallback =
+                    new NullableResult<Map<Long, AllNullableTypes>>() {
+                      public void success(Map<Long, AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4903,7 +5814,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableDouble(aDoubleArg, resultCallback);
+                api.echoAsyncNullableClassMap(classMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4913,7 +5824,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4921,10 +5832,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aBoolArg = (Boolean) args.get(0);
-                NullableResult<Boolean> resultCallback =
-                    new NullableResult<Boolean>() {
-                      public void success(Boolean result) {
+                AnEnum anEnumArg = (AnEnum) args.get(0);
+                NullableResult<AnEnum> resultCallback =
+                    new NullableResult<AnEnum>() {
+                      public void success(AnEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4935,7 +5846,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableBool(aBoolArg, resultCallback);
+                api.echoAsyncNullableEnum(anEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4945,7 +5856,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherAsyncNullableEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -4953,10 +5864,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aStringArg = (String) args.get(0);
-                NullableResult<String> resultCallback =
-                    new NullableResult<String>() {
-                      public void success(String result) {
+                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                NullableResult<AnotherEnum> resultCallback =
+                    new NullableResult<AnotherEnum>() {
+                      public void success(AnotherEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -4967,7 +5878,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableString(aStringArg, resultCallback);
+                api.echoAnotherAsyncNullableEnum(anotherEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -4977,19 +5888,17 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                byte[] aUint8ListArg = (byte[]) args.get(0);
-                NullableResult<byte[]> resultCallback =
-                    new NullableResult<byte[]>() {
-                      public void success(byte[] result) {
-                        wrapped.add(0, result);
+                VoidResult resultCallback =
+                    new VoidResult() {
+                      public void success() {
+                        wrapped.add(0, null);
                         reply.reply(wrapped);
                       }
 
@@ -4999,7 +5908,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableUint8List(aUint8ListArg, resultCallback);
+                api.callFlutterNoop(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5009,15 +5918,13 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                Object anObjectArg = args.get(0);
                 NullableResult<Object> resultCallback =
                     new NullableResult<Object>() {
                       public void success(Object result) {
@@ -5031,7 +5938,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableObject(anObjectArg, resultCallback);
+                api.callFlutterThrowError(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5041,19 +5948,17 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                List<Object> listArg = (List<Object>) args.get(0);
-                NullableResult<List<Object>> resultCallback =
-                    new NullableResult<List<Object>>() {
-                      public void success(List<Object> result) {
-                        wrapped.add(0, result);
+                VoidResult resultCallback =
+                    new VoidResult() {
+                      public void success() {
+                        wrapped.add(0, null);
                         reply.reply(wrapped);
                       }
 
@@ -5063,7 +5968,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableList(listArg, resultCallback);
+                api.callFlutterThrowErrorFromVoid(resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5073,7 +5978,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnumList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5081,10 +5986,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
-                NullableResult<List<AnEnum>> resultCallback =
-                    new NullableResult<List<AnEnum>>() {
-                      public void success(List<AnEnum> result) {
+                AllTypes everythingArg = (AllTypes) args.get(0);
+                Result<AllTypes> resultCallback =
+                    new Result<AllTypes>() {
+                      public void success(AllTypes result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5095,7 +6000,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableEnumList(enumListArg, resultCallback);
+                api.callFlutterEchoAllTypes(everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5105,7 +6010,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableClassList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5113,10 +6018,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
-                NullableResult<List<AllNullableTypes>> resultCallback =
-                    new NullableResult<List<AllNullableTypes>>() {
-                      public void success(List<AllNullableTypes> result) {
+                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
+                NullableResult<AllNullableTypes> resultCallback =
+                    new NullableResult<AllNullableTypes>() {
+                      public void success(AllNullableTypes result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5127,7 +6032,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableClassList(classListArg, resultCallback);
+                api.callFlutterEchoAllNullableTypes(everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5137,7 +6042,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5145,10 +6050,12 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
-                NullableResult<Map<Object, Object>> resultCallback =
-                    new NullableResult<Map<Object, Object>>() {
-                      public void success(Map<Object, Object> result) {
+                Boolean aNullableBoolArg = (Boolean) args.get(0);
+                Long aNullableIntArg = (Long) args.get(1);
+                String aNullableStringArg = (String) args.get(2);
+                Result<AllNullableTypes> resultCallback =
+                    new Result<AllNullableTypes>() {
+                      public void success(AllNullableTypes result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5159,7 +6066,8 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableMap(mapArg, resultCallback);
+                api.callFlutterSendMultipleNullableTypes(
+                    aNullableBoolArg, aNullableIntArg, aNullableStringArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5169,7 +6077,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5177,10 +6085,11 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
-                NullableResult<Map<String, String>> resultCallback =
-                    new NullableResult<Map<String, String>>() {
-                      public void success(Map<String, String> result) {
+                AllNullableTypesWithoutRecursion everythingArg =
+                    (AllNullableTypesWithoutRecursion) args.get(0);
+                NullableResult<AllNullableTypesWithoutRecursion> resultCallback =
+                    new NullableResult<AllNullableTypesWithoutRecursion>() {
+                      public void success(AllNullableTypesWithoutRecursion result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5191,7 +6100,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableStringMap(stringMapArg, resultCallback);
+                api.callFlutterEchoAllNullableTypesWithoutRecursion(everythingArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5201,7 +6110,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5209,10 +6118,12 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
-                NullableResult<Map<Long, Long>> resultCallback =
-                    new NullableResult<Map<Long, Long>>() {
-                      public void success(Map<Long, Long> result) {
+                Boolean aNullableBoolArg = (Boolean) args.get(0);
+                Long aNullableIntArg = (Long) args.get(1);
+                String aNullableStringArg = (String) args.get(2);
+                Result<AllNullableTypesWithoutRecursion> resultCallback =
+                    new Result<AllNullableTypesWithoutRecursion>() {
+                      public void success(AllNullableTypesWithoutRecursion result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5223,7 +6134,8 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableIntMap(intMapArg, resultCallback);
+                api.callFlutterSendMultipleNullableTypesWithoutRecursion(
+                    aNullableBoolArg, aNullableIntArg, aNullableStringArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5233,7 +6145,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5241,10 +6153,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
-                NullableResult<Map<AnEnum, AnEnum>> resultCallback =
-                    new NullableResult<Map<AnEnum, AnEnum>>() {
-                      public void success(Map<AnEnum, AnEnum> result) {
+                Boolean aBoolArg = (Boolean) args.get(0);
+                Result<Boolean> resultCallback =
+                    new Result<Boolean>() {
+                      public void success(Boolean result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5255,7 +6167,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableEnumMap(enumMapArg, resultCallback);
+                api.callFlutterEchoBool(aBoolArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5265,7 +6177,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5273,10 +6185,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
-                NullableResult<Map<Long, AllNullableTypes>> resultCallback =
-                    new NullableResult<Map<Long, AllNullableTypes>>() {
-                      public void success(Map<Long, AllNullableTypes> result) {
+                Long anIntArg = (Long) args.get(0);
+                Result<Long> resultCallback =
+                    new Result<Long>() {
+                      public void success(Long result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5287,7 +6199,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableClassMap(classMapArg, resultCallback);
+                api.callFlutterEchoInt(anIntArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5297,7 +6209,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5305,10 +6217,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnEnum anEnumArg = (AnEnum) args.get(0);
-                NullableResult<AnEnum> resultCallback =
-                    new NullableResult<AnEnum>() {
-                      public void success(AnEnum result) {
+                Double aDoubleArg = (Double) args.get(0);
+                Result<Double> resultCallback =
+                    new Result<Double>() {
+                      public void success(Double result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5319,7 +6231,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAsyncNullableEnum(anEnumArg, resultCallback);
+                api.callFlutterEchoDouble(aDoubleArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5329,7 +6241,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherAsyncNullableEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5337,10 +6249,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
-                NullableResult<AnotherEnum> resultCallback =
-                    new NullableResult<AnotherEnum>() {
-                      public void success(AnotherEnum result) {
+                String aStringArg = (String) args.get(0);
+                Result<String> resultCallback =
+                    new Result<String>() {
+                      public void success(String result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5351,7 +6263,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.echoAnotherAsyncNullableEnum(anotherEnumArg, resultCallback);
+                api.callFlutterEchoString(aStringArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5361,17 +6273,19 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                VoidResult resultCallback =
-                    new VoidResult() {
-                      public void success() {
-                        wrapped.add(0, null);
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                byte[] listArg = (byte[]) args.get(0);
+                Result<byte[]> resultCallback =
+                    new Result<byte[]>() {
+                      public void success(byte[] result) {
+                        wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
 
@@ -5381,7 +6295,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterNoop(resultCallback);
+                api.callFlutterEchoUint8List(listArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5391,16 +6305,18 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                NullableResult<Object> resultCallback =
-                    new NullableResult<Object>() {
-                      public void success(Object result) {
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<Object> listArg = (List<Object>) args.get(0);
+                Result<List<Object>> resultCallback =
+                    new Result<List<Object>>() {
+                      public void success(List<Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5411,7 +6327,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterThrowError(resultCallback);
+                api.callFlutterEchoList(listArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5421,17 +6337,19 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
-                VoidResult resultCallback =
-                    new VoidResult() {
-                      public void success() {
-                        wrapped.add(0, null);
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                Result<List<AnEnum>> resultCallback =
+                    new Result<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
+                        wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
 
@@ -5441,7 +6359,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterThrowErrorFromVoid(resultCallback);
+                api.callFlutterEchoEnumList(enumListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5451,7 +6369,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5459,10 +6377,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllTypes everythingArg = (AllTypes) args.get(0);
-                Result<AllTypes> resultCallback =
-                    new Result<AllTypes>() {
-                      public void success(AllTypes result) {
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                Result<List<AllNullableTypes>> resultCallback =
+                    new Result<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5473,7 +6391,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoAllTypes(everythingArg, resultCallback);
+                api.callFlutterEchoClassList(classListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5483,7 +6401,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5491,10 +6409,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypes everythingArg = (AllNullableTypes) args.get(0);
-                NullableResult<AllNullableTypes> resultCallback =
-                    new NullableResult<AllNullableTypes>() {
-                      public void success(AllNullableTypes result) {
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                Result<List<AnEnum>> resultCallback =
+                    new Result<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5505,7 +6423,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoAllNullableTypes(everythingArg, resultCallback);
+                api.callFlutterEchoNonNullEnumList(enumListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5515,7 +6433,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5523,12 +6441,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aNullableBoolArg = (Boolean) args.get(0);
-                Long aNullableIntArg = (Long) args.get(1);
-                String aNullableStringArg = (String) args.get(2);
-                Result<AllNullableTypes> resultCallback =
-                    new Result<AllNullableTypes>() {
-                      public void success(AllNullableTypes result) {
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                Result<List<AllNullableTypes>> resultCallback =
+                    new Result<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5539,8 +6455,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterSendMultipleNullableTypes(
-                    aNullableBoolArg, aNullableIntArg, aNullableStringArg, resultCallback);
+                api.callFlutterEchoNonNullClassList(classListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5550,7 +6465,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5558,11 +6473,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AllNullableTypesWithoutRecursion everythingArg =
-                    (AllNullableTypesWithoutRecursion) args.get(0);
-                NullableResult<AllNullableTypesWithoutRecursion> resultCallback =
-                    new NullableResult<AllNullableTypesWithoutRecursion>() {
-                      public void success(AllNullableTypesWithoutRecursion result) {
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                Result<Map<Object, Object>> resultCallback =
+                    new Result<Map<Object, Object>>() {
+                      public void success(Map<Object, Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5573,7 +6487,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoAllNullableTypesWithoutRecursion(everythingArg, resultCallback);
+                api.callFlutterEchoMap(mapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5583,7 +6497,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5591,12 +6505,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aNullableBoolArg = (Boolean) args.get(0);
-                Long aNullableIntArg = (Long) args.get(1);
-                String aNullableStringArg = (String) args.get(2);
-                Result<AllNullableTypesWithoutRecursion> resultCallback =
-                    new Result<AllNullableTypesWithoutRecursion>() {
-                      public void success(AllNullableTypesWithoutRecursion result) {
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                Result<Map<String, String>> resultCallback =
+                    new Result<Map<String, String>>() {
+                      public void success(Map<String, String> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5607,8 +6519,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterSendMultipleNullableTypesWithoutRecursion(
-                    aNullableBoolArg, aNullableIntArg, aNullableStringArg, resultCallback);
+                api.callFlutterEchoStringMap(stringMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5618,7 +6529,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5626,10 +6537,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aBoolArg = (Boolean) args.get(0);
-                Result<Boolean> resultCallback =
-                    new Result<Boolean>() {
-                      public void success(Boolean result) {
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                Result<Map<Long, Long>> resultCallback =
+                    new Result<Map<Long, Long>>() {
+                      public void success(Map<Long, Long> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5640,7 +6551,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoBool(aBoolArg, resultCallback);
+                api.callFlutterEchoIntMap(intMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5650,7 +6561,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5658,10 +6569,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long anIntArg = (Long) args.get(0);
-                Result<Long> resultCallback =
-                    new Result<Long>() {
-                      public void success(Long result) {
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                Result<Map<AnEnum, AnEnum>> resultCallback =
+                    new Result<Map<AnEnum, AnEnum>>() {
+                      public void success(Map<AnEnum, AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5672,7 +6583,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoInt(anIntArg, resultCallback);
+                api.callFlutterEchoEnumMap(enumMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5682,7 +6593,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5690,10 +6601,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aDoubleArg = (Double) args.get(0);
-                Result<Double> resultCallback =
-                    new Result<Double>() {
-                      public void success(Double result) {
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                Result<Map<Long, AllNullableTypes>> resultCallback =
+                    new Result<Map<Long, AllNullableTypes>>() {
+                      public void success(Map<Long, AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5704,7 +6615,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoDouble(aDoubleArg, resultCallback);
+                api.callFlutterEchoClassMap(classMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5714,7 +6625,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5722,10 +6633,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aStringArg = (String) args.get(0);
-                Result<String> resultCallback =
-                    new Result<String>() {
-                      public void success(String result) {
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                Result<Map<String, String>> resultCallback =
+                    new Result<Map<String, String>>() {
+                      public void success(Map<String, String> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5736,7 +6647,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoString(aStringArg, resultCallback);
+                api.callFlutterEchoNonNullStringMap(stringMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5746,7 +6657,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5754,10 +6665,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                byte[] listArg = (byte[]) args.get(0);
-                Result<byte[]> resultCallback =
-                    new Result<byte[]>() {
-                      public void success(byte[] result) {
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                Result<Map<Long, Long>> resultCallback =
+                    new Result<Map<Long, Long>>() {
+                      public void success(Map<Long, Long> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5768,7 +6679,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoUint8List(listArg, resultCallback);
+                api.callFlutterEchoNonNullIntMap(intMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5778,7 +6689,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5786,10 +6697,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<Object> listArg = (List<Object>) args.get(0);
-                Result<List<Object>> resultCallback =
-                    new Result<List<Object>>() {
-                      public void success(List<Object> result) {
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                Result<Map<AnEnum, AnEnum>> resultCallback =
+                    new Result<Map<AnEnum, AnEnum>>() {
+                      public void success(Map<AnEnum, AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5800,7 +6711,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoList(listArg, resultCallback);
+                api.callFlutterEchoNonNullEnumMap(enumMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5810,7 +6721,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnumList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5818,10 +6729,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
-                Result<List<AnEnum>> resultCallback =
-                    new Result<List<AnEnum>>() {
-                      public void success(List<AnEnum> result) {
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                Result<Map<Long, AllNullableTypes>> resultCallback =
+                    new Result<Map<Long, AllNullableTypes>>() {
+                      public void success(Map<Long, AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5832,7 +6743,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoEnumList(enumListArg, resultCallback);
+                api.callFlutterEchoNonNullClassMap(classMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5842,7 +6753,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoClassList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5850,10 +6761,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
-                Result<List<AllNullableTypes>> resultCallback =
-                    new Result<List<AllNullableTypes>>() {
-                      public void success(List<AllNullableTypes> result) {
+                AnEnum anEnumArg = (AnEnum) args.get(0);
+                Result<AnEnum> resultCallback =
+                    new Result<AnEnum>() {
+                      public void success(AnEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5864,7 +6775,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoClassList(classListArg, resultCallback);
+                api.callFlutterEchoEnum(anEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5874,7 +6785,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5882,10 +6793,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
-                Result<Map<Object, Object>> resultCallback =
-                    new Result<Map<Object, Object>>() {
-                      public void success(Map<Object, Object> result) {
+                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
+                Result<AnotherEnum> resultCallback =
+                    new Result<AnotherEnum>() {
+                      public void success(AnotherEnum result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5896,7 +6807,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoMap(mapArg, resultCallback);
+                api.callFlutterEchoAnotherEnum(anotherEnumArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5906,7 +6817,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5914,10 +6825,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
-                Result<Map<String, String>> resultCallback =
-                    new Result<Map<String, String>>() {
-                      public void success(Map<String, String> result) {
+                Boolean aBoolArg = (Boolean) args.get(0);
+                NullableResult<Boolean> resultCallback =
+                    new NullableResult<Boolean>() {
+                      public void success(Boolean result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5928,7 +6839,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoStringMap(stringMapArg, resultCallback);
+                api.callFlutterEchoNullableBool(aBoolArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5938,7 +6849,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5946,10 +6857,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
-                Result<Map<Long, Long>> resultCallback =
-                    new Result<Map<Long, Long>>() {
-                      public void success(Map<Long, Long> result) {
+                Long anIntArg = (Long) args.get(0);
+                NullableResult<Long> resultCallback =
+                    new NullableResult<Long>() {
+                      public void success(Long result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5960,7 +6871,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoIntMap(intMapArg, resultCallback);
+                api.callFlutterEchoNullableInt(anIntArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -5970,7 +6881,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -5978,10 +6889,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
-                Result<Map<AnEnum, AnEnum>> resultCallback =
-                    new Result<Map<AnEnum, AnEnum>>() {
-                      public void success(Map<AnEnum, AnEnum> result) {
+                Double aDoubleArg = (Double) args.get(0);
+                NullableResult<Double> resultCallback =
+                    new NullableResult<Double>() {
+                      public void success(Double result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -5992,7 +6903,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoEnumMap(enumMapArg, resultCallback);
+                api.callFlutterEchoNullableDouble(aDoubleArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6002,7 +6913,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6010,10 +6921,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
-                Result<Map<Long, AllNullableTypes>> resultCallback =
-                    new Result<Map<Long, AllNullableTypes>>() {
-                      public void success(Map<Long, AllNullableTypes> result) {
+                String aStringArg = (String) args.get(0);
+                NullableResult<String> resultCallback =
+                    new NullableResult<String>() {
+                      public void success(String result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6024,7 +6935,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoClassMap(classMapArg, resultCallback);
+                api.callFlutterEchoNullableString(aStringArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6034,7 +6945,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6042,10 +6953,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnEnum anEnumArg = (AnEnum) args.get(0);
-                Result<AnEnum> resultCallback =
-                    new Result<AnEnum>() {
-                      public void success(AnEnum result) {
+                byte[] listArg = (byte[]) args.get(0);
+                NullableResult<byte[]> resultCallback =
+                    new NullableResult<byte[]>() {
+                      public void success(byte[] result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6056,7 +6967,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoEnum(anEnumArg, resultCallback);
+                api.callFlutterEchoNullableUint8List(listArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6066,7 +6977,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6074,10 +6985,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                AnotherEnum anotherEnumArg = (AnotherEnum) args.get(0);
-                Result<AnotherEnum> resultCallback =
-                    new Result<AnotherEnum>() {
-                      public void success(AnotherEnum result) {
+                List<Object> listArg = (List<Object>) args.get(0);
+                NullableResult<List<Object>> resultCallback =
+                    new NullableResult<List<Object>>() {
+                      public void success(List<Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6088,7 +6999,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoAnotherEnum(anotherEnumArg, resultCallback);
+                api.callFlutterEchoNullableList(listArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6098,7 +7009,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6106,10 +7017,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Boolean aBoolArg = (Boolean) args.get(0);
-                NullableResult<Boolean> resultCallback =
-                    new NullableResult<Boolean>() {
-                      public void success(Boolean result) {
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                NullableResult<List<AnEnum>> resultCallback =
+                    new NullableResult<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6120,7 +7031,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableBool(aBoolArg, resultCallback);
+                api.callFlutterEchoNullableEnumList(enumListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6130,7 +7041,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6138,10 +7049,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Long anIntArg = (Long) args.get(0);
-                NullableResult<Long> resultCallback =
-                    new NullableResult<Long>() {
-                      public void success(Long result) {
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                NullableResult<List<AllNullableTypes>> resultCallback =
+                    new NullableResult<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6152,7 +7063,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableInt(anIntArg, resultCallback);
+                api.callFlutterEchoNullableClassList(classListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6162,7 +7073,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6170,10 +7081,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Double aDoubleArg = (Double) args.get(0);
-                NullableResult<Double> resultCallback =
-                    new NullableResult<Double>() {
-                      public void success(Double result) {
+                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
+                NullableResult<List<AnEnum>> resultCallback =
+                    new NullableResult<List<AnEnum>>() {
+                      public void success(List<AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6184,7 +7095,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableDouble(aDoubleArg, resultCallback);
+                api.callFlutterEchoNullableNonNullEnumList(enumListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6194,7 +7105,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6202,10 +7113,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                String aStringArg = (String) args.get(0);
-                NullableResult<String> resultCallback =
-                    new NullableResult<String>() {
-                      public void success(String result) {
+                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
+                NullableResult<List<AllNullableTypes>> resultCallback =
+                    new NullableResult<List<AllNullableTypes>>() {
+                      public void success(List<AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6216,7 +7127,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableString(aStringArg, resultCallback);
+                api.callFlutterEchoNullableNonNullClassList(classListArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6226,18 +7137,18 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
-                ArrayList<Object> wrapped = new ArrayList<>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                byte[] listArg = (byte[]) args.get(0);
-                NullableResult<byte[]> resultCallback =
-                    new NullableResult<byte[]>() {
-                      public void success(byte[] result) {
+                ArrayList<Object> wrapped = new ArrayList<>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
+                NullableResult<Map<Object, Object>> resultCallback =
+                    new NullableResult<Map<Object, Object>>() {
+                      public void success(Map<Object, Object> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6248,7 +7159,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableUint8List(listArg, resultCallback);
+                api.callFlutterEchoNullableMap(mapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6258,7 +7169,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6266,10 +7177,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<Object> listArg = (List<Object>) args.get(0);
-                NullableResult<List<Object>> resultCallback =
-                    new NullableResult<List<Object>>() {
-                      public void success(List<Object> result) {
+                Map<String, String> stringMapArg = (Map<String, String>) args.get(0);
+                NullableResult<Map<String, String>> resultCallback =
+                    new NullableResult<Map<String, String>>() {
+                      public void success(Map<String, String> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6280,7 +7191,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableList(listArg, resultCallback);
+                api.callFlutterEchoNullableStringMap(stringMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6290,7 +7201,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6298,10 +7209,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AnEnum> enumListArg = (List<AnEnum>) args.get(0);
-                NullableResult<List<AnEnum>> resultCallback =
-                    new NullableResult<List<AnEnum>>() {
-                      public void success(List<AnEnum> result) {
+                Map<Long, Long> intMapArg = (Map<Long, Long>) args.get(0);
+                NullableResult<Map<Long, Long>> resultCallback =
+                    new NullableResult<Map<Long, Long>>() {
+                      public void success(Map<Long, Long> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6312,7 +7223,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableEnumList(enumListArg, resultCallback);
+                api.callFlutterEchoNullableIntMap(intMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6322,7 +7233,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6330,10 +7241,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                List<AllNullableTypes> classListArg = (List<AllNullableTypes>) args.get(0);
-                NullableResult<List<AllNullableTypes>> resultCallback =
-                    new NullableResult<List<AllNullableTypes>>() {
-                      public void success(List<AllNullableTypes> result) {
+                Map<AnEnum, AnEnum> enumMapArg = (Map<AnEnum, AnEnum>) args.get(0);
+                NullableResult<Map<AnEnum, AnEnum>> resultCallback =
+                    new NullableResult<Map<AnEnum, AnEnum>>() {
+                      public void success(Map<AnEnum, AnEnum> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6344,7 +7255,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableClassList(classListArg, resultCallback);
+                api.callFlutterEchoNullableEnumMap(enumMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6354,7 +7265,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6362,10 +7273,10 @@ public void error(Throwable error) {
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
-                Map<Object, Object> mapArg = (Map<Object, Object>) args.get(0);
-                NullableResult<Map<Object, Object>> resultCallback =
-                    new NullableResult<Map<Object, Object>>() {
-                      public void success(Map<Object, Object> result) {
+                Map<Long, AllNullableTypes> classMapArg = (Map<Long, AllNullableTypes>) args.get(0);
+                NullableResult<Map<Long, AllNullableTypes>> resultCallback =
+                    new NullableResult<Map<Long, AllNullableTypes>>() {
+                      public void success(Map<Long, AllNullableTypes> result) {
                         wrapped.add(0, result);
                         reply.reply(wrapped);
                       }
@@ -6376,7 +7287,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableMap(mapArg, resultCallback);
+                api.callFlutterEchoNullableClassMap(classMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6386,7 +7297,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableStringMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6408,7 +7319,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableStringMap(stringMapArg, resultCallback);
+                api.callFlutterEchoNullableNonNullStringMap(stringMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6418,7 +7329,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableIntMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6440,7 +7351,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableIntMap(intMapArg, resultCallback);
+                api.callFlutterEchoNullableNonNullIntMap(intMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6450,7 +7361,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6472,7 +7383,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableEnumMap(enumMapArg, resultCallback);
+                api.callFlutterEchoNullableNonNullEnumMap(enumMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6482,7 +7393,7 @@ public void error(Throwable error) {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassMap"
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap"
                     + messageChannelSuffix,
                 getCodec());
         if (api != null) {
@@ -6504,7 +7415,7 @@ public void error(Throwable error) {
                       }
                     };
 
-                api.callFlutterEchoNullableClassMap(classMapArg, resultCallback);
+                api.callFlutterEchoNullableNonNullClassMap(classMapArg, resultCallback);
               });
         } else {
           channel.setMessageHandler(null);
@@ -6886,7 +7797,200 @@ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Result<Boolean> result)
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(aBoolArg)),
+          new ArrayList<>(Collections.singletonList(aBoolArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Boolean output = (Boolean) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed int, to test serialization and deserialization. */
+    public void echoInt(@NonNull Long anIntArg, @NonNull Result<Long> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(anIntArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Long output = (Long) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed double, to test serialization and deserialization. */
+    public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result<Double> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(aDoubleArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Double output = (Double) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed string, to test serialization and deserialization. */
+    public void echoString(@NonNull String aStringArg, @NonNull Result<String> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(aStringArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                String output = (String) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed byte list, to test serialization and deserialization. */
+    public void echoUint8List(@NonNull byte[] listArg, @NonNull Result<byte[]> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(listArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                byte[] output = (byte[]) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoList(@NonNull List<Object> listArg, @NonNull Result<List<Object>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(listArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else if (listReply.get(0) == null) {
+                result.error(
+                    new FlutterError(
+                        "null-error",
+                        "Flutter api returned null value for non-null return value.",
+                        ""));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                List<Object> output = (List<Object>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoEnumList(
+        @NonNull List<AnEnum> enumListArg, @NonNull Result<List<AnEnum>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(enumListArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -6902,7 +8006,7 @@ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Result<Boolean> result)
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                Boolean output = (Boolean) listReply.get(0);
+                List<AnEnum> output = (List<AnEnum>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -6910,15 +8014,17 @@ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Result<Boolean> result)
             }
           });
     }
-    /** Returns the passed int, to test serialization and deserialization. */
-    public void echoInt(@NonNull Long anIntArg, @NonNull Result<Long> result) {
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoClassList(
+        @NonNull List<AllNullableTypes> classListArg,
+        @NonNull Result<List<AllNullableTypes>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(anIntArg)),
+          new ArrayList<>(Collections.singletonList(classListArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -6934,7 +8040,7 @@ public void echoInt(@NonNull Long anIntArg, @NonNull Result<Long> result) {
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                Long output = (Long) listReply.get(0);
+                List<AllNullableTypes> output = (List<AllNullableTypes>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -6942,15 +8048,16 @@ public void echoInt(@NonNull Long anIntArg, @NonNull Result<Long> result) {
             }
           });
     }
-    /** Returns the passed double, to test serialization and deserialization. */
-    public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result<Double> result) {
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoNonNullEnumList(
+        @NonNull List<AnEnum> enumListArg, @NonNull Result<List<AnEnum>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(aDoubleArg)),
+          new ArrayList<>(Collections.singletonList(enumListArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -6966,7 +8073,7 @@ public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result<Double> resul
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                Double output = (Double) listReply.get(0);
+                List<AnEnum> output = (List<AnEnum>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -6974,15 +8081,17 @@ public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result<Double> resul
             }
           });
     }
-    /** Returns the passed string, to test serialization and deserialization. */
-    public void echoString(@NonNull String aStringArg, @NonNull Result<String> result) {
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoNonNullClassList(
+        @NonNull List<AllNullableTypes> classListArg,
+        @NonNull Result<List<AllNullableTypes>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(aStringArg)),
+          new ArrayList<>(Collections.singletonList(classListArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -6998,7 +8107,7 @@ public void echoString(@NonNull String aStringArg, @NonNull Result<String> resul
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                String output = (String) listReply.get(0);
+                List<AllNullableTypes> output = (List<AllNullableTypes>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7006,15 +8115,16 @@ public void echoString(@NonNull String aStringArg, @NonNull Result<String> resul
             }
           });
     }
-    /** Returns the passed byte list, to test serialization and deserialization. */
-    public void echoUint8List(@NonNull byte[] listArg, @NonNull Result<byte[]> result) {
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoMap(
+        @NonNull Map<Object, Object> mapArg, @NonNull Result<Map<Object, Object>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(listArg)),
+          new ArrayList<>(Collections.singletonList(mapArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -7030,7 +8140,7 @@ public void echoUint8List(@NonNull byte[] listArg, @NonNull Result<byte[]> resul
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                byte[] output = (byte[]) listReply.get(0);
+                Map<Object, Object> output = (Map<Object, Object>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7038,15 +8148,16 @@ public void echoUint8List(@NonNull byte[] listArg, @NonNull Result<byte[]> resul
             }
           });
     }
-    /** Returns the passed list, to test serialization and deserialization. */
-    public void echoList(@NonNull List<Object> listArg, @NonNull Result<List<Object>> result) {
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoStringMap(
+        @NonNull Map<String, String> stringMapArg, @NonNull Result<Map<String, String>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(listArg)),
+          new ArrayList<>(Collections.singletonList(stringMapArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -7062,7 +8173,7 @@ public void echoList(@NonNull List<Object> listArg, @NonNull Result<List<Object>
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                List<Object> output = (List<Object>) listReply.get(0);
+                Map<String, String> output = (Map<String, String>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7070,16 +8181,16 @@ public void echoList(@NonNull List<Object> listArg, @NonNull Result<List<Object>
             }
           });
     }
-    /** Returns the passed list, to test serialization and deserialization. */
-    public void echoEnumList(
-        @NonNull List<AnEnum> enumListArg, @NonNull Result<List<AnEnum>> result) {
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoIntMap(
+        @NonNull Map<Long, Long> intMapArg, @NonNull Result<Map<Long, Long>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(enumListArg)),
+          new ArrayList<>(Collections.singletonList(intMapArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -7095,7 +8206,7 @@ public void echoEnumList(
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                List<AnEnum> output = (List<AnEnum>) listReply.get(0);
+                Map<Long, Long> output = (Map<Long, Long>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7103,17 +8214,16 @@ public void echoEnumList(
             }
           });
     }
-    /** Returns the passed list, to test serialization and deserialization. */
-    public void echoClassList(
-        @NonNull List<AllNullableTypes> classListArg,
-        @NonNull Result<List<AllNullableTypes>> result) {
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoEnumMap(
+        @NonNull Map<AnEnum, AnEnum> enumMapArg, @NonNull Result<Map<AnEnum, AnEnum>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(classListArg)),
+          new ArrayList<>(Collections.singletonList(enumMapArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -7129,7 +8239,7 @@ public void echoClassList(
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                List<AllNullableTypes> output = (List<AllNullableTypes>) listReply.get(0);
+                Map<AnEnum, AnEnum> output = (Map<AnEnum, AnEnum>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7138,15 +8248,16 @@ public void echoClassList(
           });
     }
     /** Returns the passed map, to test serialization and deserialization. */
-    public void echoMap(
-        @NonNull Map<Object, Object> mapArg, @NonNull Result<Map<Object, Object>> result) {
+    public void echoClassMap(
+        @NonNull Map<Long, AllNullableTypes> classMapArg,
+        @NonNull Result<Map<Long, AllNullableTypes>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
       channel.send(
-          new ArrayList<>(Collections.singletonList(mapArg)),
+          new ArrayList<>(Collections.singletonList(classMapArg)),
           channelReply -> {
             if (channelReply instanceof List) {
               List<Object> listReply = (List<Object>) channelReply;
@@ -7162,7 +8273,7 @@ public void echoMap(
                         ""));
               } else {
                 @SuppressWarnings("ConstantConditions")
-                Map<Object, Object> output = (Map<Object, Object>) listReply.get(0);
+                Map<Long, AllNullableTypes> output = (Map<Long, AllNullableTypes>) listReply.get(0);
                 result.success(output);
               }
             } else {
@@ -7171,10 +8282,10 @@ public void echoMap(
           });
     }
     /** Returns the passed map, to test serialization and deserialization. */
-    public void echoStringMap(
+    public void echoNonNullStringMap(
         @NonNull Map<String, String> stringMapArg, @NonNull Result<Map<String, String>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
@@ -7204,10 +8315,10 @@ public void echoStringMap(
           });
     }
     /** Returns the passed map, to test serialization and deserialization. */
-    public void echoIntMap(
+    public void echoNonNullIntMap(
         @NonNull Map<Long, Long> intMapArg, @NonNull Result<Map<Long, Long>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
@@ -7237,10 +8348,10 @@ public void echoIntMap(
           });
     }
     /** Returns the passed map, to test serialization and deserialization. */
-    public void echoEnumMap(
+    public void echoNonNullEnumMap(
         @NonNull Map<AnEnum, AnEnum> enumMapArg, @NonNull Result<Map<AnEnum, AnEnum>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
@@ -7270,11 +8381,11 @@ public void echoEnumMap(
           });
     }
     /** Returns the passed map, to test serialization and deserialization. */
-    public void echoClassMap(
+    public void echoNonNullClassMap(
         @NonNull Map<Long, AllNullableTypes> classMapArg,
         @NonNull Result<Map<Long, AllNullableTypes>> result) {
       final String channelName =
-          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap"
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap"
               + messageChannelSuffix;
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
@@ -7584,6 +8695,61 @@ public void echoNullableClassList(
             }
           });
     }
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoNullableNonNullEnumList(
+        @Nullable List<AnEnum> enumListArg, @NonNull NullableResult<List<AnEnum>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(enumListArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                List<AnEnum> output = (List<AnEnum>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed list, to test serialization and deserialization. */
+    public void echoNullableNonNullClassList(
+        @Nullable List<AllNullableTypes> classListArg,
+        @NonNull NullableResult<List<AllNullableTypes>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(classListArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                List<AllNullableTypes> output = (List<AllNullableTypes>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
     /** Returns the passed map, to test serialization and deserialization. */
     public void echoNullableMap(
         @Nullable Map<Object, Object> mapArg, @NonNull NullableResult<Map<Object, Object>> result) {
@@ -7722,6 +8888,117 @@ public void echoNullableClassMap(
             }
           });
     }
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoNullableNonNullStringMap(
+        @Nullable Map<String, String> stringMapArg,
+        @NonNull NullableResult<Map<String, String>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(stringMapArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Map<String, String> output = (Map<String, String>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoNullableNonNullIntMap(
+        @Nullable Map<Long, Long> intMapArg, @NonNull NullableResult<Map<Long, Long>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(intMapArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Map<Long, Long> output = (Map<Long, Long>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoNullableNonNullEnumMap(
+        @Nullable Map<AnEnum, AnEnum> enumMapArg,
+        @NonNull NullableResult<Map<AnEnum, AnEnum>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(enumMapArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Map<AnEnum, AnEnum> output = (Map<AnEnum, AnEnum>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
+    /** Returns the passed map, to test serialization and deserialization. */
+    public void echoNullableNonNullClassMap(
+        @Nullable Map<Long, AllNullableTypes> classMapArg,
+        @NonNull NullableResult<Map<Long, AllNullableTypes>> result) {
+      final String channelName =
+          "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap"
+              + messageChannelSuffix;
+      BasicMessageChannel<Object> channel =
+          new BasicMessageChannel<>(binaryMessenger, channelName, getCodec());
+      channel.send(
+          new ArrayList<>(Collections.singletonList(classMapArg)),
+          channelReply -> {
+            if (channelReply instanceof List) {
+              List<Object> listReply = (List<Object>) channelReply;
+              if (listReply.size() > 1) {
+                result.error(
+                    new FlutterError(
+                        (String) listReply.get(0), (String) listReply.get(1), listReply.get(2)));
+              } else {
+                @SuppressWarnings("ConstantConditions")
+                Map<Long, AllNullableTypes> output = (Map<Long, AllNullableTypes>) listReply.get(0);
+                result.success(output);
+              }
+            } else {
+              result.error(createConnectionError(channelName));
+            }
+          });
+    }
     /** Returns the passed enum to test serialization and deserialization. */
     public void echoNullableEnum(
         @Nullable AnEnum anEnumArg, @NonNull NullableResult<AnEnum> result) {
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
index 5eb69d8bc38..2d95c14dc64 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
@@ -190,6 +190,7 @@ public void hasValues() {
             .setDoubleList(Arrays.asList(new Double[] {0.5, 0.25, 1.5, 1.25}))
             .setIntList(Arrays.asList(new Long[] {1l, 2l, 3l, 4l}))
             .setStringList(Arrays.asList(new String[] {"string", "another one"}))
+            .setObjectList(genericList)
             .setEnumList(
                 Arrays.asList(
                     new CoreTests.AnEnum[] {CoreTests.AnEnum.ONE, CoreTests.AnEnum.FORTY_TWO}))
@@ -197,6 +198,7 @@ public void hasValues() {
             .setMap(makeMap("hello", 1234))
             .setIntMap(makeMap(1L, 0L))
             .setStringMap(makeMap("hello", "you"))
+            .setObjectMap(makeMap("E", 4321))
             .setEnumMap(makeMap(CoreTests.AnEnum.ONE, CoreTests.AnEnum.FOUR_HUNDRED_TWENTY_TWO))
             .build();
 
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
index c97133e4e6c..1b72e5e1c0d 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
@@ -38,7 +38,9 @@ - (void)testAllNull {
                    XCTAssertNil(result.intList);
                    XCTAssertNil(result.doubleList);
                    XCTAssertNil(result.stringList);
+                   XCTAssertNil(result.objectList);
                    XCTAssertNil(result.map);
+                   XCTAssertNil(result.objectMap);
                    [expectation fulfill];
                  }];
   [self waitForExpectations:@[ expectation ] timeout:1.0];
@@ -63,10 +65,12 @@ - (void)testAllEquals {
   everything.intList = @[ @1, @2 ];
   everything.doubleList = @[ @1.1, @2.2 ];
   everything.stringList = @[ @"string", @"another one" ];
+  everything.objectList = @[ @"string", @1 ];
   everything.listList = @[ @[ @"string" ], @[ @"another one" ] ];
   everything.map = @{@"hello" : @(1234), @"goodbye" : @"world"};
   everything.stringMap = @{@"hello" : @"you", @"goodbye" : @"world"};
   everything.intMap = @{@(1) : @(0), @(2) : @(-2)};
+  everything.objectMap = @{@"hello" : @(1234), @"goodbye" : @"world"};
   EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:FLTGetCoreTestsCodec()];
   FLTFlutterIntegrationCoreApi *api =
@@ -91,10 +95,12 @@ - (void)testAllEquals {
                    XCTAssertEqualObjects(result.intList, everything.intList);
                    XCTAssertEqualObjects(result.doubleList, everything.doubleList);
                    XCTAssertEqualObjects(result.stringList, everything.stringList);
+                   XCTAssertEqualObjects(result.objectList, everything.objectList);
                    XCTAssertEqualObjects(result.listList, everything.listList);
                    XCTAssertEqualObjects(result.map, everything.map);
                    XCTAssertEqualObjects(result.stringMap, everything.stringMap);
                    XCTAssertEqualObjects(result.intMap, everything.intMap);
+                   XCTAssertEqualObjects(result.objectMap, everything.objectMap);
                    [expectation fulfill];
                  }];
   [self waitForExpectations:@[ expectation ] timeout:1.0];
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m
index 2b3dfede6fe..d684acfd55e 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m
@@ -106,6 +106,18 @@ - (nullable id)echoObject:(id)anObject error:(FlutterError *_Nullable *_Nonnull)
   return classList;
 }
 
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNonNullEnumList:(nonnull NSArray<FLTAnEnumBox *> *)enumList
+                  error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumList;
+}
+
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNonNullClassList:(nonnull NSArray<FLTAllNullableTypes *> *)classList
+                   error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classList;
+}
+
 - (nullable NSDictionary<id, id> *)echoMap:(NSDictionary<id, id> *)map
                                      error:(FlutterError *_Nullable *_Nonnull)error {
   return map;
@@ -135,6 +147,30 @@ - (nullable id)echoObject:(id)anObject error:(FlutterError *_Nullable *_Nonnull)
   return classMap;
 }
 
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNonNullStringMap:(nonnull NSDictionary<NSString *, NSString *> *)stringMap
+                   error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return stringMap;
+}
+
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNonNullIntMap:(nonnull NSDictionary<NSNumber *, NSNumber *> *)intMap
+                error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return intMap;
+}
+
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNonNullEnumMap:(nonnull NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                 error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumMap;
+}
+
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNonNullClassMap:(nonnull NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                  error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classMap;
+}
+
 - (nullable FLTAllClassesWrapper *)echoClassWrapper:(FLTAllClassesWrapper *)wrapper
                                               error:(FlutterError *_Nullable *_Nonnull)error {
   return wrapper;
@@ -254,9 +290,21 @@ - (nullable id)echoNullableObject:(nullable id)aNullableObject
 }
 
 - (nullable NSArray<FLTAllNullableTypes *> *)
-    echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)FLTAllNullableTypes
+    echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                     error:(FlutterError *_Nullable *_Nonnull)error {
-  return FLTAllNullableTypes;
+  return classList;
+}
+
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                          error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumList;
+}
+
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                           error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classList;
 }
 
 - (nullable NSDictionary<id, id> *)echoNullableMap:(nullable NSDictionary<id, id> *)map
@@ -288,6 +336,30 @@ - (nullable id)echoNullableObject:(nullable id)aNullableObject
   return classMap;
 }
 
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                           error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return stringMap;
+}
+
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                        error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return intMap;
+}
+
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                         error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumMap;
+}
+
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNullableNonNullClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                          error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classMap;
+}
+
 - (FLTAnEnumBox *_Nullable)echoNullableEnum:(nullable FLTAnEnumBox *)AnEnumBoxed
                                       error:(FlutterError *_Nullable *_Nonnull)error {
   return AnEnumBoxed;
@@ -656,6 +728,25 @@ - (void)callFlutterEchoClassList:(NSArray<FLTAllNullableTypes *> *)classList
                       }];
 }
 
+- (void)callFlutterEchoNonNullEnumList:(nonnull NSArray<FLTAnEnumBox *> *)enumList
+                            completion:(nonnull void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                         FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullEnumList:enumList
+                            completion:^(NSArray<FLTAnEnumBox *> *value, FlutterError *error) {
+                              completion(value, error);
+                            }];
+}
+
+- (void)callFlutterEchoNonNullClassList:(nonnull NSArray<FLTAllNullableTypes *> *)classList
+                             completion:(nonnull void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullClassList:classList
+                completion:^(NSArray<FLTAllNullableTypes *> *value, FlutterError *error) {
+                  completion(value, error);
+                }];
+}
+
 - (void)callFlutterEchoMap:(NSDictionary<id, id> *)map
                 completion:
                     (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
@@ -705,6 +796,53 @@ - (void)callFlutterEchoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *>
         }];
 }
 
+- (void)callFlutterEchoNonNullStringMap:(nonnull NSDictionary<NSString *, NSString *> *)stringMap
+                             completion:
+                                 (nonnull void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                   FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullStringMap:stringMap
+                completion:^(NSDictionary<NSString *, NSString *> *value, FlutterError *error) {
+                  completion(value, error);
+                }];
+}
+
+- (void)callFlutterEchoNonNullIntMap:(nonnull NSDictionary<NSNumber *, NSNumber *> *)intMap
+                          completion:
+                              (nonnull void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullIntMap:intMap
+             completion:^(NSDictionary<NSNumber *, NSNumber *> *value, FlutterError *error) {
+               completion(value, error);
+             }];
+}
+
+- (void)callFlutterEchoNonNullEnumMap:
+            (nonnull NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                           completion:(nonnull void (^)(
+                                          NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullEnumMap:enumMap
+                           completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *value,
+                                        FlutterError *error) {
+                             completion(value, error);
+                           }];
+}
+
+- (void)callFlutterEchoNonNullClassMap:
+            (nonnull NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                            completion:
+                                (nonnull void (^)(
+                                    NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullClassMap:classMap
+                            completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *> *value,
+                                         FlutterError *error) {
+                              completion(value, error);
+                            }];
+}
+
 - (void)callFlutterEchoEnum:(FLTAnEnum)anEnum
                  completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   [self.flutterAPI echoEnum:anEnum
@@ -818,6 +956,28 @@ - (void)callFlutterEchoNullableClassList:(nullable NSArray<FLTAllNullableTypes *
                  }];
 }
 
+- (void)callFlutterEchoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                                    completion:
+                                        (nonnull void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullEnumList:enumList
+                       completion:^(NSArray<FLTAnEnumBox *> *value, FlutterError *error) {
+                         completion(value, error);
+                       }];
+}
+
+- (void)callFlutterEchoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                                     completion:(nonnull void (^)(
+                                                    NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullClassList:classList
+                        completion:^(NSArray<FLTAllNullableTypes *> *value, FlutterError *error) {
+                          completion(value, error);
+                        }];
+}
+
 - (void)callFlutterEchoNullableMap:(nullable NSDictionary<id, id> *)map
                         completion:(void (^)(NSDictionary<id, id> *_Nullable,
                                              FlutterError *_Nullable))completion {
@@ -872,6 +1032,57 @@ - (void)callFlutterEchoNullableEnumMap:
                              }];
 }
 
+- (void)callFlutterEchoNullableNonNullStringMap:
+            (nullable NSDictionary<NSString *, NSString *> *)stringMap
+                                     completion:(nonnull void (^)(
+                                                    NSDictionary<NSString *, NSString *> *_Nullable,
+                                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullStringMap:stringMap
+                                     completion:^(NSDictionary<NSString *, NSString *> *value,
+                                                  FlutterError *error) {
+                                       completion(value, error);
+                                     }];
+}
+
+- (void)callFlutterEchoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                                  completion:(nonnull void (^)(
+                                                 NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                 FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullIntMap:intMap
+                                  completion:^(NSDictionary<NSNumber *, NSNumber *> *value,
+                                               FlutterError *error) {
+                                    completion(value, error);
+                                  }];
+}
+
+- (void)callFlutterEchoNullableNonNullEnumMap:
+            (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                                   completion:
+                                       (nonnull void (^)(
+                                           NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                           FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullEnumMap:enumMap
+                                   completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *value,
+                                                FlutterError *error) {
+                                     completion(value, error);
+                                   }];
+}
+
+- (void)
+    callFlutterEchoNullableNonNullClassMap:
+        (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                                completion:
+                                    (nonnull void (^)(
+                                        NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                        FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullClassMap:classMap
+                       completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *> *value,
+                                    FlutterError *error) {
+                         completion(value, error);
+                       }];
+}
+
 - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)AnEnumBoxed
                          completion:(void (^)(FLTAnEnumBox *_Nullable,
                                               FlutterError *_Nullable))completion {
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
index 957d8a5693a..822cdf7aa57 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
@@ -72,11 +72,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                    doubleList:(NSArray<NSNumber *> *)doubleList
                      boolList:(NSArray<NSNumber *> *)boolList
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
+                   objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
-                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap;
+                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                    objectMap:(NSDictionary<id, id> *)objectMap;
 @property(nonatomic, assign) BOOL aBool;
 @property(nonatomic, assign) NSInteger anInt;
 @property(nonatomic, assign) NSInteger anInt64;
@@ -95,11 +97,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy) NSArray<id> *objectList;
 @property(nonatomic, copy) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy) NSDictionary *map;
 @property(nonatomic, copy) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy) NSDictionary<id, id> *objectMap;
 @end
 
 /// A class containing all supported nullable types.
@@ -124,12 +128,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                doubleList:(nullable NSArray<NSNumber *> *)doubleList
                  boolList:(nullable NSArray<NSNumber *> *)boolList
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
@@ -151,12 +157,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy, nullable) NSArray<FLTAllNullableTypes *> *recursiveClassList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
 @property(nonatomic, copy, nullable)
     NSDictionary<NSNumber *, FLTAllNullableTypes *> *recursiveClassMap;
 @end
@@ -183,12 +191,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                            doubleList:(nullable NSArray<NSNumber *> *)doubleList
                              boolList:(nullable NSArray<NSNumber *> *)boolList
                              enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                           objectList:(nullable NSArray<id> *)objectList
                              listList:(nullable NSArray<NSArray<id> *> *)listList
                                   map:(nullable NSDictionary *)map
                             stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                                intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                               enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap;
+                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                            objectMap:(nullable NSDictionary<id, id> *)objectMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -207,11 +217,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
 @end
 
 /// A class for testing nested class handling.
@@ -314,6 +326,17 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSArray<FLTAllNullableTypes *> *)echoClassList:
                                                  (NSArray<FLTAllNullableTypes *> *)classList
                                                      error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSArray<FLTAnEnumBox *> *)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                                                    error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                   error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed map, to test serialization and deserialization.
 ///
 /// @return `nil` only when `error != nil`.
@@ -343,6 +366,30 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
     echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
            error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                   error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+                error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                 error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                  error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed class to test nested class serialization and deserialization.
 ///
 /// @return `nil` only when `error != nil`.
@@ -437,6 +484,14 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSArray<FLTAllNullableTypes *> *)
     echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                     error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                          error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                           error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed map, to test serialization and deserialization.
 - (nullable NSDictionary<id, id> *)echoNullableMap:(nullable NSDictionary<id, id> *)map
                                              error:(FlutterError *_Nullable *_Nonnull)error;
@@ -456,6 +511,22 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
     echoNullableClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
                    error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                           error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                        error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                         error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNullableNonNullClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                          error:(FlutterError *_Nullable *_Nonnull)error;
 - (FLTAnEnumBox *_Nullable)echoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
                                       error:(FlutterError *_Nullable *_Nonnull)error;
 - (FLTAnotherEnumBox *_Nullable)echoAnotherNullableEnum:
@@ -655,6 +726,12 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (void)callFlutterEchoClassList:(NSArray<FLTAllNullableTypes *> *)classList
                       completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                            FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                            completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                 FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                             completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                  FlutterError *_Nullable))completion;
 - (void)callFlutterEchoMap:(NSDictionary<id, id> *)map
                 completion:
                     (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion;
@@ -671,6 +748,21 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
                      completion:
                          (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                    FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                             completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                  FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+                          completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                           completion:
+                               (void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                         FlutterError *_Nullable))completion;
+- (void)
+    callFlutterEchoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                        completion:
+                            (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
 - (void)callFlutterEchoEnum:(FLTAnEnum)anEnum
                  completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
 - (void)callFlutterEchoAnotherEnum:(FLTAnotherEnum)anotherEnum
@@ -700,6 +792,12 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (void)callFlutterEchoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                               completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                                    FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                                    completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                         FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                                     completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                          FlutterError *_Nullable))completion;
 - (void)callFlutterEchoNullableMap:(nullable NSDictionary<id, id> *)map
                         completion:(void (^)(NSDictionary<id, id> *_Nullable,
                                              FlutterError *_Nullable))completion;
@@ -720,6 +818,27 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
                          completion:
                              (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                        FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullStringMap:
+            (nullable NSDictionary<NSString *, NSString *> *)stringMap
+                                     completion:
+                                         (void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                   FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                                  completion:
+                                      (void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullEnumMap:
+            (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                                   completion:
+                                       (void (^)(
+                                           NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                           FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                                    completion:
+                                        (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                      *_Nullable,
+                                                  FlutterError *_Nullable))completion;
 - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
                          completion:
                              (void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
@@ -808,6 +927,14 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoClassList:(NSArray<FLTAllNullableTypes *> *)classList
            completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                 FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                 completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                  completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
 /// Returns the passed map, to test serialization and deserialization.
 - (void)echoMap:(NSDictionary<id, id> *)map
      completion:(void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion;
@@ -827,6 +954,22 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
           completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                  completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+               completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                    FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                     FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                 completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
 /// Returns the passed enum to test serialization and deserialization.
 - (void)echoEnum:(FLTAnEnum)anEnum
       completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
@@ -860,6 +1003,14 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                    completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                         FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                         completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                              FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                          completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
 /// Returns the passed map, to test serialization and deserialization.
 - (void)echoNullableMap:(nullable NSDictionary<id, id> *)map
              completion:
@@ -880,6 +1031,25 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoNullableClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
                   completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                        FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                          completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                       completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                            FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                        completion:
+                            (void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                         completion:
+                             (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
 /// Returns the passed enum to test serialization and deserialization.
 - (void)echoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
               completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
index 427682c43b8..3bbd52011cb 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
@@ -136,11 +136,13 @@ + (instancetype)makeWithABool:(BOOL)aBool
                    doubleList:(NSArray<NSNumber *> *)doubleList
                      boolList:(NSArray<NSNumber *> *)boolList
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
+                   objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
-                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap {
+                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                    objectMap:(NSDictionary<id, id> *)objectMap {
   FLTAllTypes *pigeonResult = [[FLTAllTypes alloc] init];
   pigeonResult.aBool = aBool;
   pigeonResult.anInt = anInt;
@@ -160,11 +162,13 @@ + (instancetype)makeWithABool:(BOOL)aBool
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   return pigeonResult;
 }
 + (FLTAllTypes *)fromList:(NSArray<id> *)list {
@@ -189,11 +193,13 @@ + (FLTAllTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 15);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
   return pigeonResult;
 }
 + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
@@ -219,11 +225,13 @@ + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
   ];
 }
 @end
@@ -249,12 +257,14 @@ @implementation FLTAllNullableTypes
                doubleList:(nullable NSArray<NSNumber *> *)doubleList
                  boolList:(nullable NSArray<NSNumber *> *)boolList
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap {
   FLTAllNullableTypes *pigeonResult = [[FLTAllNullableTypes alloc] init];
@@ -277,12 +287,14 @@ @implementation FLTAllNullableTypes
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.recursiveClassList = recursiveClassList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   pigeonResult.recursiveClassMap = recursiveClassMap;
   return pigeonResult;
 }
@@ -307,13 +319,15 @@ + (FLTAllNullableTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
-  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
@@ -340,12 +354,14 @@ + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.recursiveClassList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
     self.recursiveClassMap ?: [NSNull null],
   ];
 }
@@ -370,12 +386,14 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
                            doubleList:(nullable NSArray<NSNumber *> *)doubleList
                              boolList:(nullable NSArray<NSNumber *> *)boolList
                              enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                           objectList:(nullable NSArray<id> *)objectList
                              listList:(nullable NSArray<NSArray<id> *> *)listList
                                   map:(nullable NSDictionary *)map
                             stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                                intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                               enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap {
+                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                            objectMap:(nullable NSDictionary<id, id> *)objectMap {
   FLTAllNullableTypesWithoutRecursion *pigeonResult =
       [[FLTAllNullableTypesWithoutRecursion alloc] init];
   pigeonResult.aNullableBool = aNullableBool;
@@ -396,11 +414,13 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   return pigeonResult;
 }
 + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
@@ -424,11 +444,13 @@ + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 15);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id> *)list {
@@ -454,11 +476,13 @@ + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id>
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
   ];
 }
 @end
@@ -975,6 +999,57 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullEnumList",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullEnumList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullEnumList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAnEnumBox *> *output = [api echoNonNullEnumList:arg_enumList error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullClassList",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullClassList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullClassList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAllNullableTypes *> *output = [api echoNonNullClassList:arg_classList
+                                                                     error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1104,6 +1179,112 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullStringMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullStringMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullStringMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSString *, NSString *> *output = [api echoNonNullStringMap:arg_stringMap
+                                                                           error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullIntMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullIntMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullIntMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSNumber *, NSNumber *> *output = [api echoNonNullIntMap:arg_intMap
+                                                                        error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullEnumMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullEnumMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullEnumMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output = [api echoNonNullEnumMap:arg_enumMap
+                                                                                 error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullClassMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullClassMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullClassMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+            [api echoNonNullClassMap:arg_classMap error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed class to test nested class serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1657,6 +1838,60 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullEnumList",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullEnumList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNullableNonNullEnumList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAnEnumBox *> *output = [api echoNullableNonNullEnumList:arg_enumList
+                                                                     error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullClassList",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullClassList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNullableNonNullClassList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAllNullableTypes *> *output = [api echoNullableNonNullClassList:arg_classList
+                                                                             error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1788,152 +2023,262 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:@"%@%@",
-                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.echoNullableEnum",
-                                                   messageChannelSuffix]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullStringMap",
+                                             messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoNullableEnum:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullStringMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoNullableEnum:error:)",
+                @"@selector(echoNullableNonNullStringMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        FLTAnEnumBox *arg_anEnum = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        FLTAnEnumBox *output = [api echoNullableEnum:arg_anEnum error:&error];
+        NSDictionary<NSString *, NSString *> *output =
+            [api echoNullableNonNullStringMap:arg_stringMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoAnotherNullableEnum",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullIntMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoAnotherNullableEnum:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullIntMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoAnotherNullableEnum:error:)",
+                @"@selector(echoNullableNonNullIntMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        FLTAnotherEnumBox *arg_anotherEnum = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        FLTAnotherEnumBox *output = [api echoAnotherNullableEnum:arg_anotherEnum error:&error];
+        NSDictionary<NSNumber *, NSNumber *> *output = [api echoNullableNonNullIntMap:arg_intMap
+                                                                                error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns passed in int.
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoOptionalNullableInt",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullEnumMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoOptionalNullableInt:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullEnumMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoOptionalNullableInt:error:)",
+                @"@selector(echoNullableNonNullEnumMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSNumber *arg_aNullableInt = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        NSNumber *output = [api echoOptionalNullableInt:arg_aNullableInt error:&error];
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+            [api echoNullableNonNullEnumMap:arg_enumMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns the passed in string.
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoNamedNullableString",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullClassMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoNamedNullableString:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullClassMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoNamedNullableString:error:)",
+                @"@selector(echoNullableNonNullClassMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSString *arg_aNullableString = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        NSString *output = [api echoNamedNullableString:arg_aNullableString error:&error];
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+            [api echoNullableNonNullClassMap:arg_classMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// A no-op function taking no arguments and returning no value, to sanity
-  /// test basic asynchronous calling.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
                                                    @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.noopAsync",
+                                                   @"HostIntegrationCoreApi.echoNullableEnum",
                                                    messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(noopAsyncWithCompletion:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableEnum:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(noopAsyncWithCompletion:)",
+                @"@selector(echoNullableEnum:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        [api noopAsyncWithCompletion:^(FlutterError *_Nullable error) {
-          callback(wrapResult(nil, error));
-        }];
+        NSArray<id> *args = message;
+        FLTAnEnumBox *arg_anEnum = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        FLTAnEnumBox *output = [api echoNullableEnum:arg_anEnum error:&error];
+        callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns passed in int asynchronously.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:@"%@%@",
-                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.echoAsyncInt",
-                                                   messageChannelSuffix]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoAnotherNullableEnum",
+                                             messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoAsyncInt:completion:)],
+      NSCAssert([api respondsToSelector:@selector(echoAnotherNullableEnum:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoAsyncInt:completion:)",
+                @"@selector(echoAnotherNullableEnum:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSInteger arg_anInt = [GetNullableObjectAtIndex(args, 0) integerValue];
-        [api echoAsyncInt:arg_anInt
-               completion:^(NSNumber *_Nullable output, FlutterError *_Nullable error) {
-                 callback(wrapResult(output, error));
-               }];
+        FLTAnotherEnumBox *arg_anotherEnum = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        FLTAnotherEnumBox *output = [api echoAnotherNullableEnum:arg_anotherEnum error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns passed in int.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoOptionalNullableInt",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoOptionalNullableInt:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoOptionalNullableInt:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSNumber *arg_aNullableInt = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSNumber *output = [api echoOptionalNullableInt:arg_aNullableInt error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed in string.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNamedNullableString",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNamedNullableString:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNamedNullableString:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSString *arg_aNullableString = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSString *output = [api echoNamedNullableString:arg_aNullableString error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// A no-op function taking no arguments and returning no value, to sanity
+  /// test basic asynchronous calling.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.noopAsync",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(noopAsyncWithCompletion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(noopAsyncWithCompletion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        [api noopAsyncWithCompletion:^(FlutterError *_Nullable error) {
+          callback(wrapResult(nil, error));
+        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns passed in int asynchronously.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoAsyncInt",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoAsyncInt:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoAsyncInt:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSInteger arg_anInt = [GetNullableObjectAtIndex(args, 0) integerValue];
+        [api echoAsyncInt:arg_anInt
+               completion:^(NSNumber *_Nullable output, FlutterError *_Nullable error) {
+                 callback(wrapResult(output, error));
+               }];
       }];
     } else {
       [channel setMessageHandler:nil];
@@ -3367,6 +3712,60 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullEnumList",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullEnumList:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullEnumList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullEnumList:arg_enumList
+                                 completion:^(NSArray<FLTAnEnumBox *> *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                   callback(wrapResult(output, error));
+                                 }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullClassList",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullClassList:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullClassList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullClassList:arg_classList
+                                  completion:^(NSArray<FLTAllNullableTypes *> *_Nullable output,
+                                               FlutterError *_Nullable error) {
+                                    callback(wrapResult(output, error));
+                                  }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
@@ -3503,6 +3902,119 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullStringMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullStringMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullStringMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullStringMap:arg_stringMap
+                                  completion:^(
+                                      NSDictionary<NSString *, NSString *> *_Nullable output,
+                                      FlutterError *_Nullable error) {
+                                    callback(wrapResult(output, error));
+                                  }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.callFlutterEchoNonNullIntMap",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullIntMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullIntMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullIntMap:arg_intMap
+                               completion:^(NSDictionary<NSNumber *, NSNumber *> *_Nullable output,
+                                            FlutterError *_Nullable error) {
+                                 callback(wrapResult(output, error));
+                               }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullEnumMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullEnumMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullEnumMap:arg_enumMap
+                                completion:^(
+                                    NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable output,
+                                    FlutterError *_Nullable error) {
+                                  callback(wrapResult(output, error));
+                                }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullClassMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullClassMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullClassMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullClassMap:arg_classMap
+                                 completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                  *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                   callback(wrapResult(output, error));
+                                 }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
@@ -3776,25 +4288,27 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
-                            stringWithFormat:@"%@%@",
-                                             @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.callFlutterEchoNullableMap",
-                                             messageChannelSuffix]
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList",
+                                messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableMap:completion:)],
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullEnumList:
+                                                                              completion:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(callFlutterEchoNullableMap:completion:)",
+                @"@selector(callFlutterEchoNullableNonNullEnumList:completion:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSDictionary<id, id> *arg_map = GetNullableObjectAtIndex(args, 0);
-        [api callFlutterEchoNullableMap:arg_map
-                             completion:^(NSDictionary<id, id> *_Nullable output,
-                                          FlutterError *_Nullable error) {
-                               callback(wrapResult(output, error));
-                             }];
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullEnumList:arg_enumList
+                                         completion:^(NSArray<FLTAnEnumBox *> *_Nullable output,
+                                                      FlutterError *_Nullable error) {
+                                           callback(wrapResult(output, error));
+                                         }];
       }];
     } else {
       [channel setMessageHandler:nil];
@@ -3802,12 +4316,69 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
   }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:
-                                      @"%@%@",
-                                      @"dev.flutter.pigeon.pigeon_integration_tests."
-                                      @"HostIntegrationCoreApi.callFlutterEchoNullableStringMap",
-                                      messageChannelSuffix]
-        binaryMessenger:binaryMessenger
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullClassList:
+                                                                               completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullClassList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullClassList:arg_classList
+                                          completion:^(
+                                              NSArray<FLTAllNullableTypes *> *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                            callback(wrapResult(output, error));
+                                          }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.callFlutterEchoNullableMap",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<id, id> *arg_map = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableMap:arg_map
+                             completion:^(NSDictionary<id, id> *_Nullable output,
+                                          FlutterError *_Nullable error) {
+                               callback(wrapResult(output, error));
+                             }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:
+                                      @"%@%@",
+                                      @"dev.flutter.pigeon.pigeon_integration_tests."
+                                      @"HostIntegrationCoreApi.callFlutterEchoNullableStringMap",
+                                      messageChannelSuffix]
+        binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
       NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableStringMap:completion:)],
@@ -3913,6 +4484,130 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullStringMap:
+                                                                               completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullStringMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        [api
+            callFlutterEchoNullableNonNullStringMap:arg_stringMap
+                                         completion:^(
+                                             NSDictionary<NSString *, NSString *> *_Nullable output,
+                                             FlutterError *_Nullable error) {
+                                           callback(wrapResult(output, error));
+                                         }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString
+                   stringWithFormat:@"%@%@",
+                                    @"dev.flutter.pigeon.pigeon_integration_tests."
+                                    @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap",
+                                    messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullIntMap:
+                                                                            completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullIntMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullIntMap:arg_intMap
+                                       completion:^(
+                                           NSDictionary<NSNumber *, NSNumber *> *_Nullable output,
+                                           FlutterError *_Nullable error) {
+                                         callback(wrapResult(output, error));
+                                       }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString
+                   stringWithFormat:@"%@%@",
+                                    @"dev.flutter.pigeon.pigeon_integration_tests."
+                                    @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap",
+                                    messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullEnumMap:
+                                                                             completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullEnumMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullEnumMap:arg_enumMap
+                                        completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *>
+                                                         *_Nullable output,
+                                                     FlutterError *_Nullable error) {
+                                          callback(wrapResult(output, error));
+                                        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullClassMap:
+                                                                              completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullClassMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api
+            callFlutterEchoNullableNonNullClassMap:arg_classMap
+                                        completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                         *_Nullable output,
+                                                     FlutterError *_Nullable error) {
+                                          callback(wrapResult(output, error));
+                                        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
@@ -4466,6 +5161,63 @@ - (void)echoClassList:(NSArray<FLTAllNullableTypes *> *)arg_classList
                    }
                  }];
 }
+- (void)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)arg_enumList
+                 completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullEnumList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAnEnumBox *> *output = reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)arg_classList
+                  completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullClassList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoMap:(NSDictionary<id, id> *)arg_map
      completion:(void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
@@ -4608,6 +5360,121 @@ - (void)echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_clas
                    }
                  }];
 }
+- (void)echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)arg_stringMap
+                  completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullStringMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_stringMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSString *, NSString *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)arg_intMap
+               completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                    FlutterError *_Nullable))completion {
+  NSString *channelName = [NSString stringWithFormat:@"%@%@",
+                                                     @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                     @"FlutterIntegrationCoreApi.echoNonNullIntMap",
+                                                     _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_intMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, NSNumber *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)arg_enumMap
+                completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                     FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullEnumMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_classMap
+                 completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullClassMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoEnum:(FLTAnEnum)arg_anEnum
       completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
@@ -4884,6 +5751,63 @@ - (void)echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)arg_cla
                    }
                  }];
 }
+- (void)echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)arg_enumList
+                         completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                              FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullEnumList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAnEnumBox *> *output = reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)arg_classList
+                          completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                               FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullClassList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoNullableMap:(nullable NSDictionary<id, id> *)arg_map
              completion:
                  (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
@@ -5029,6 +5953,125 @@ - (void)echoNullableClassMap:
                    }
                  }];
 }
+- (void)echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)arg_stringMap
+                          completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                               FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullStringMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_stringMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSString *, NSString *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)arg_intMap
+                       completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                            FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullIntMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_intMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, NSNumber *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)arg_enumMap
+                    completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                         FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullEnumMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_classMap
+                         completion:
+                             (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullClassMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoNullableEnum:(nullable FLTAnEnumBox *)arg_anEnum
               completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m
index 2b3dfede6fe..d684acfd55e 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m
@@ -106,6 +106,18 @@ - (nullable id)echoObject:(id)anObject error:(FlutterError *_Nullable *_Nonnull)
   return classList;
 }
 
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNonNullEnumList:(nonnull NSArray<FLTAnEnumBox *> *)enumList
+                  error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumList;
+}
+
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNonNullClassList:(nonnull NSArray<FLTAllNullableTypes *> *)classList
+                   error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classList;
+}
+
 - (nullable NSDictionary<id, id> *)echoMap:(NSDictionary<id, id> *)map
                                      error:(FlutterError *_Nullable *_Nonnull)error {
   return map;
@@ -135,6 +147,30 @@ - (nullable id)echoObject:(id)anObject error:(FlutterError *_Nullable *_Nonnull)
   return classMap;
 }
 
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNonNullStringMap:(nonnull NSDictionary<NSString *, NSString *> *)stringMap
+                   error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return stringMap;
+}
+
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNonNullIntMap:(nonnull NSDictionary<NSNumber *, NSNumber *> *)intMap
+                error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return intMap;
+}
+
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNonNullEnumMap:(nonnull NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                 error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumMap;
+}
+
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNonNullClassMap:(nonnull NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                  error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classMap;
+}
+
 - (nullable FLTAllClassesWrapper *)echoClassWrapper:(FLTAllClassesWrapper *)wrapper
                                               error:(FlutterError *_Nullable *_Nonnull)error {
   return wrapper;
@@ -254,9 +290,21 @@ - (nullable id)echoNullableObject:(nullable id)aNullableObject
 }
 
 - (nullable NSArray<FLTAllNullableTypes *> *)
-    echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)FLTAllNullableTypes
+    echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                     error:(FlutterError *_Nullable *_Nonnull)error {
-  return FLTAllNullableTypes;
+  return classList;
+}
+
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                          error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumList;
+}
+
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                           error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classList;
 }
 
 - (nullable NSDictionary<id, id> *)echoNullableMap:(nullable NSDictionary<id, id> *)map
@@ -288,6 +336,30 @@ - (nullable id)echoNullableObject:(nullable id)aNullableObject
   return classMap;
 }
 
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                           error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return stringMap;
+}
+
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                        error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return intMap;
+}
+
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                         error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return enumMap;
+}
+
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNullableNonNullClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                          error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
+  return classMap;
+}
+
 - (FLTAnEnumBox *_Nullable)echoNullableEnum:(nullable FLTAnEnumBox *)AnEnumBoxed
                                       error:(FlutterError *_Nullable *_Nonnull)error {
   return AnEnumBoxed;
@@ -656,6 +728,25 @@ - (void)callFlutterEchoClassList:(NSArray<FLTAllNullableTypes *> *)classList
                       }];
 }
 
+- (void)callFlutterEchoNonNullEnumList:(nonnull NSArray<FLTAnEnumBox *> *)enumList
+                            completion:(nonnull void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                         FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullEnumList:enumList
+                            completion:^(NSArray<FLTAnEnumBox *> *value, FlutterError *error) {
+                              completion(value, error);
+                            }];
+}
+
+- (void)callFlutterEchoNonNullClassList:(nonnull NSArray<FLTAllNullableTypes *> *)classList
+                             completion:(nonnull void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullClassList:classList
+                completion:^(NSArray<FLTAllNullableTypes *> *value, FlutterError *error) {
+                  completion(value, error);
+                }];
+}
+
 - (void)callFlutterEchoMap:(NSDictionary<id, id> *)map
                 completion:
                     (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
@@ -705,6 +796,53 @@ - (void)callFlutterEchoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *>
         }];
 }
 
+- (void)callFlutterEchoNonNullStringMap:(nonnull NSDictionary<NSString *, NSString *> *)stringMap
+                             completion:
+                                 (nonnull void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                   FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullStringMap:stringMap
+                completion:^(NSDictionary<NSString *, NSString *> *value, FlutterError *error) {
+                  completion(value, error);
+                }];
+}
+
+- (void)callFlutterEchoNonNullIntMap:(nonnull NSDictionary<NSNumber *, NSNumber *> *)intMap
+                          completion:
+                              (nonnull void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNonNullIntMap:intMap
+             completion:^(NSDictionary<NSNumber *, NSNumber *> *value, FlutterError *error) {
+               completion(value, error);
+             }];
+}
+
+- (void)callFlutterEchoNonNullEnumMap:
+            (nonnull NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                           completion:(nonnull void (^)(
+                                          NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullEnumMap:enumMap
+                           completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *value,
+                                        FlutterError *error) {
+                             completion(value, error);
+                           }];
+}
+
+- (void)callFlutterEchoNonNullClassMap:
+            (nonnull NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                            completion:
+                                (nonnull void (^)(
+                                    NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNonNullClassMap:classMap
+                            completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *> *value,
+                                         FlutterError *error) {
+                              completion(value, error);
+                            }];
+}
+
 - (void)callFlutterEchoEnum:(FLTAnEnum)anEnum
                  completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   [self.flutterAPI echoEnum:anEnum
@@ -818,6 +956,28 @@ - (void)callFlutterEchoNullableClassList:(nullable NSArray<FLTAllNullableTypes *
                  }];
 }
 
+- (void)callFlutterEchoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                                    completion:
+                                        (nonnull void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                          FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullEnumList:enumList
+                       completion:^(NSArray<FLTAnEnumBox *> *value, FlutterError *error) {
+                         completion(value, error);
+                       }];
+}
+
+- (void)callFlutterEchoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                                     completion:(nonnull void (^)(
+                                                    NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullClassList:classList
+                        completion:^(NSArray<FLTAllNullableTypes *> *value, FlutterError *error) {
+                          completion(value, error);
+                        }];
+}
+
 - (void)callFlutterEchoNullableMap:(nullable NSDictionary<id, id> *)map
                         completion:(void (^)(NSDictionary<id, id> *_Nullable,
                                              FlutterError *_Nullable))completion {
@@ -872,6 +1032,57 @@ - (void)callFlutterEchoNullableEnumMap:
                              }];
 }
 
+- (void)callFlutterEchoNullableNonNullStringMap:
+            (nullable NSDictionary<NSString *, NSString *> *)stringMap
+                                     completion:(nonnull void (^)(
+                                                    NSDictionary<NSString *, NSString *> *_Nullable,
+                                                    FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullStringMap:stringMap
+                                     completion:^(NSDictionary<NSString *, NSString *> *value,
+                                                  FlutterError *error) {
+                                       completion(value, error);
+                                     }];
+}
+
+- (void)callFlutterEchoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                                  completion:(nonnull void (^)(
+                                                 NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                 FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullIntMap:intMap
+                                  completion:^(NSDictionary<NSNumber *, NSNumber *> *value,
+                                               FlutterError *error) {
+                                    completion(value, error);
+                                  }];
+}
+
+- (void)callFlutterEchoNullableNonNullEnumMap:
+            (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                                   completion:
+                                       (nonnull void (^)(
+                                           NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                           FlutterError *_Nullable))completion {
+  [self.flutterAPI echoNullableNonNullEnumMap:enumMap
+                                   completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *value,
+                                                FlutterError *error) {
+                                     completion(value, error);
+                                   }];
+}
+
+- (void)
+    callFlutterEchoNullableNonNullClassMap:
+        (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                                completion:
+                                    (nonnull void (^)(
+                                        NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                        FlutterError *_Nullable))completion {
+  [self.flutterAPI
+      echoNullableNonNullClassMap:classMap
+                       completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *> *value,
+                                    FlutterError *error) {
+                         completion(value, error);
+                       }];
+}
+
 - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)AnEnumBoxed
                          completion:(void (^)(FLTAnEnumBox *_Nullable,
                                               FlutterError *_Nullable))completion {
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
index 957d8a5693a..822cdf7aa57 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
@@ -72,11 +72,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                    doubleList:(NSArray<NSNumber *> *)doubleList
                      boolList:(NSArray<NSNumber *> *)boolList
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
+                   objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
-                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap;
+                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                    objectMap:(NSDictionary<id, id> *)objectMap;
 @property(nonatomic, assign) BOOL aBool;
 @property(nonatomic, assign) NSInteger anInt;
 @property(nonatomic, assign) NSInteger anInt64;
@@ -95,11 +97,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy) NSArray<id> *objectList;
 @property(nonatomic, copy) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy) NSDictionary *map;
 @property(nonatomic, copy) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy) NSDictionary<id, id> *objectMap;
 @end
 
 /// A class containing all supported nullable types.
@@ -124,12 +128,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                doubleList:(nullable NSArray<NSNumber *> *)doubleList
                  boolList:(nullable NSArray<NSNumber *> *)boolList
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
@@ -151,12 +157,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy, nullable) NSArray<FLTAllNullableTypes *> *recursiveClassList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
 @property(nonatomic, copy, nullable)
     NSDictionary<NSNumber *, FLTAllNullableTypes *> *recursiveClassMap;
 @end
@@ -183,12 +191,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                            doubleList:(nullable NSArray<NSNumber *> *)doubleList
                              boolList:(nullable NSArray<NSNumber *> *)boolList
                              enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                           objectList:(nullable NSArray<id> *)objectList
                              listList:(nullable NSArray<NSArray<id> *> *)listList
                                   map:(nullable NSDictionary *)map
                             stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                                intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                               enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap;
+                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                            objectMap:(nullable NSDictionary<id, id> *)objectMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -207,11 +217,13 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *doubleList;
 @property(nonatomic, copy, nullable) NSArray<NSNumber *> *boolList;
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
+@property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
+@property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
 @end
 
 /// A class for testing nested class handling.
@@ -314,6 +326,17 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSArray<FLTAllNullableTypes *> *)echoClassList:
                                                  (NSArray<FLTAllNullableTypes *> *)classList
                                                      error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSArray<FLTAnEnumBox *> *)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                                                    error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                   error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed map, to test serialization and deserialization.
 ///
 /// @return `nil` only when `error != nil`.
@@ -343,6 +366,30 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
     echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
            error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                   error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+                error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                 error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+///
+/// @return `nil` only when `error != nil`.
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                  error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed class to test nested class serialization and deserialization.
 ///
 /// @return `nil` only when `error != nil`.
@@ -437,6 +484,14 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSArray<FLTAllNullableTypes *> *)
     echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                     error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+- (nullable NSArray<FLTAnEnumBox *> *)
+    echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                          error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed list, to test serialization and deserialization.
+- (nullable NSArray<FLTAllNullableTypes *> *)
+    echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                           error:(FlutterError *_Nullable *_Nonnull)error;
 /// Returns the passed map, to test serialization and deserialization.
 - (nullable NSDictionary<id, id> *)echoNullableMap:(nullable NSDictionary<id, id> *)map
                                              error:(FlutterError *_Nullable *_Nonnull)error;
@@ -456,6 +511,22 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
     echoNullableClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
                    error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSString *, NSString *> *)
+    echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                           error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSNumber *, NSNumber *> *)
+    echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                        error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                         error:(FlutterError *_Nullable *_Nonnull)error;
+/// Returns the passed map, to test serialization and deserialization.
+- (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)
+    echoNullableNonNullClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                          error:(FlutterError *_Nullable *_Nonnull)error;
 - (FLTAnEnumBox *_Nullable)echoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
                                       error:(FlutterError *_Nullable *_Nonnull)error;
 - (FLTAnotherEnumBox *_Nullable)echoAnotherNullableEnum:
@@ -655,6 +726,12 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (void)callFlutterEchoClassList:(NSArray<FLTAllNullableTypes *> *)classList
                       completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                            FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                            completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                 FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                             completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                  FlutterError *_Nullable))completion;
 - (void)callFlutterEchoMap:(NSDictionary<id, id> *)map
                 completion:
                     (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion;
@@ -671,6 +748,21 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
                      completion:
                          (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                    FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                             completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                  FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+                          completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                           completion:
+                               (void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                         FlutterError *_Nullable))completion;
+- (void)
+    callFlutterEchoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                        completion:
+                            (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
 - (void)callFlutterEchoEnum:(FLTAnEnum)anEnum
                  completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
 - (void)callFlutterEchoAnotherEnum:(FLTAnotherEnum)anotherEnum
@@ -700,6 +792,12 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
 - (void)callFlutterEchoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                               completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                                    FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                                    completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                                         FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                                     completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                                          FlutterError *_Nullable))completion;
 - (void)callFlutterEchoNullableMap:(nullable NSDictionary<id, id> *)map
                         completion:(void (^)(NSDictionary<id, id> *_Nullable,
                                              FlutterError *_Nullable))completion;
@@ -720,6 +818,27 @@ NSObject<FlutterMessageCodec> *FLTGetCoreTestsCodec(void);
                          completion:
                              (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                        FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullStringMap:
+            (nullable NSDictionary<NSString *, NSString *> *)stringMap
+                                     completion:
+                                         (void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                                   FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                                  completion:
+                                      (void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                                FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullEnumMap:
+            (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                                   completion:
+                                       (void (^)(
+                                           NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                           FlutterError *_Nullable))completion;
+- (void)callFlutterEchoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                                    completion:
+                                        (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                      *_Nullable,
+                                                  FlutterError *_Nullable))completion;
 - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
                          completion:
                              (void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
@@ -808,6 +927,14 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoClassList:(NSArray<FLTAllNullableTypes *> *)classList
            completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                 FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)enumList
+                 completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)classList
+                  completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
 /// Returns the passed map, to test serialization and deserialization.
 - (void)echoMap:(NSDictionary<id, id> *)map
      completion:(void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion;
@@ -827,6 +954,22 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
           completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)stringMap
+                  completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
+               completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                    FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                     FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                 completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
 /// Returns the passed enum to test serialization and deserialization.
 - (void)echoEnum:(FLTAnEnum)anEnum
       completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
@@ -860,6 +1003,14 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
                    completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
                                         FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                         completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                              FlutterError *_Nullable))completion;
+/// Returns the passed list, to test serialization and deserialization.
+- (void)echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)classList
+                          completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
 /// Returns the passed map, to test serialization and deserialization.
 - (void)echoNullableMap:(nullable NSDictionary<id, id> *)map
              completion:
@@ -880,6 +1031,25 @@ extern void SetUpFLTHostIntegrationCoreApiWithSuffix(
 - (void)echoNullableClassMap:(nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
                   completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
                                        FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                          completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                               FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                       completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                            FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                        completion:
+                            (void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion;
+/// Returns the passed map, to test serialization and deserialization.
+- (void)echoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)classMap
+                         completion:
+                             (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion;
 /// Returns the passed enum to test serialization and deserialization.
 - (void)echoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed
               completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion;
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
index 427682c43b8..3bbd52011cb 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
@@ -136,11 +136,13 @@ + (instancetype)makeWithABool:(BOOL)aBool
                    doubleList:(NSArray<NSNumber *> *)doubleList
                      boolList:(NSArray<NSNumber *> *)boolList
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
+                   objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
-                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap {
+                      enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                    objectMap:(NSDictionary<id, id> *)objectMap {
   FLTAllTypes *pigeonResult = [[FLTAllTypes alloc] init];
   pigeonResult.aBool = aBool;
   pigeonResult.anInt = anInt;
@@ -160,11 +162,13 @@ + (instancetype)makeWithABool:(BOOL)aBool
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   return pigeonResult;
 }
 + (FLTAllTypes *)fromList:(NSArray<id> *)list {
@@ -189,11 +193,13 @@ + (FLTAllTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 15);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
   return pigeonResult;
 }
 + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
@@ -219,11 +225,13 @@ + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
   ];
 }
 @end
@@ -249,12 +257,14 @@ @implementation FLTAllNullableTypes
                doubleList:(nullable NSArray<NSNumber *> *)doubleList
                  boolList:(nullable NSArray<NSNumber *> *)boolList
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap {
   FLTAllNullableTypes *pigeonResult = [[FLTAllNullableTypes alloc] init];
@@ -277,12 +287,14 @@ @implementation FLTAllNullableTypes
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.recursiveClassList = recursiveClassList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   pigeonResult.recursiveClassMap = recursiveClassMap;
   return pigeonResult;
 }
@@ -307,13 +319,15 @@ + (FLTAllNullableTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
-  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
@@ -340,12 +354,14 @@ + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.recursiveClassList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
     self.recursiveClassMap ?: [NSNull null],
   ];
 }
@@ -370,12 +386,14 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
                            doubleList:(nullable NSArray<NSNumber *> *)doubleList
                              boolList:(nullable NSArray<NSNumber *> *)boolList
                              enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+                           objectList:(nullable NSArray<id> *)objectList
                              listList:(nullable NSArray<NSArray<id> *> *)listList
                                   map:(nullable NSDictionary *)map
                             stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                                intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                               enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap {
+                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                            objectMap:(nullable NSDictionary<id, id> *)objectMap {
   FLTAllNullableTypesWithoutRecursion *pigeonResult =
       [[FLTAllNullableTypesWithoutRecursion alloc] init];
   pigeonResult.aNullableBool = aNullableBool;
@@ -396,11 +414,13 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
   pigeonResult.doubleList = doubleList;
   pigeonResult.boolList = boolList;
   pigeonResult.enumList = enumList;
+  pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
+  pigeonResult.objectMap = objectMap;
   return pigeonResult;
 }
 + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
@@ -424,11 +444,13 @@ + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
   pigeonResult.doubleList = GetNullableObjectAtIndex(list, 15);
   pigeonResult.boolList = GetNullableObjectAtIndex(list, 16);
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
-  pigeonResult.listList = GetNullableObjectAtIndex(list, 18);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
+  pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id> *)list {
@@ -454,11 +476,13 @@ + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id>
     self.doubleList ?: [NSNull null],
     self.boolList ?: [NSNull null],
     self.enumList ?: [NSNull null],
+    self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
+    self.objectMap ?: [NSNull null],
   ];
 }
 @end
@@ -975,6 +999,57 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullEnumList",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullEnumList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullEnumList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAnEnumBox *> *output = [api echoNonNullEnumList:arg_enumList error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullClassList",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullClassList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullClassList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAllNullableTypes *> *output = [api echoNonNullClassList:arg_classList
+                                                                     error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1104,6 +1179,112 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullStringMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullStringMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullStringMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSString *, NSString *> *output = [api echoNonNullStringMap:arg_stringMap
+                                                                           error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullIntMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullIntMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullIntMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSNumber *, NSNumber *> *output = [api echoNonNullIntMap:arg_intMap
+                                                                        error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullEnumMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullEnumMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullEnumMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output = [api echoNonNullEnumMap:arg_enumMap
+                                                                                 error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoNonNullClassMap",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNonNullClassMap:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNonNullClassMap:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+            [api echoNonNullClassMap:arg_classMap error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed class to test nested class serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1657,6 +1838,60 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullEnumList",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullEnumList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNullableNonNullEnumList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAnEnumBox *> *output = [api echoNullableNonNullEnumList:arg_enumList
+                                                                     error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullClassList",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullClassList:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNullableNonNullClassList:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSArray<FLTAllNullableTypes *> *output = [api echoNullableNonNullClassList:arg_classList
+                                                                             error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
@@ -1788,152 +2023,262 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:@"%@%@",
-                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.echoNullableEnum",
-                                                   messageChannelSuffix]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNullableNonNullStringMap",
+                                             messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoNullableEnum:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullStringMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoNullableEnum:error:)",
+                @"@selector(echoNullableNonNullStringMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        FLTAnEnumBox *arg_anEnum = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        FLTAnEnumBox *output = [api echoNullableEnum:arg_anEnum error:&error];
+        NSDictionary<NSString *, NSString *> *output =
+            [api echoNullableNonNullStringMap:arg_stringMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoAnotherNullableEnum",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullIntMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoAnotherNullableEnum:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullIntMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoAnotherNullableEnum:error:)",
+                @"@selector(echoNullableNonNullIntMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        FLTAnotherEnumBox *arg_anotherEnum = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        FLTAnotherEnumBox *output = [api echoAnotherNullableEnum:arg_anotherEnum error:&error];
+        NSDictionary<NSNumber *, NSNumber *> *output = [api echoNullableNonNullIntMap:arg_intMap
+                                                                                error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns passed in int.
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoOptionalNullableInt",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullEnumMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoOptionalNullableInt:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullEnumMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoOptionalNullableInt:error:)",
+                @"@selector(echoNullableNonNullEnumMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSNumber *arg_aNullableInt = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        NSNumber *output = [api echoOptionalNullableInt:arg_aNullableInt error:&error];
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+            [api echoNullableNonNullEnumMap:arg_enumMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns the passed in string.
+  /// Returns the passed map, to test serialization and deserialization.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
                             stringWithFormat:@"%@%@",
                                              @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.echoNamedNullableString",
+                                             @"HostIntegrationCoreApi.echoNullableNonNullClassMap",
                                              messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoNamedNullableString:error:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableNonNullClassMap:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoNamedNullableString:error:)",
+                @"@selector(echoNullableNonNullClassMap:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSString *arg_aNullableString = GetNullableObjectAtIndex(args, 0);
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
         FlutterError *error;
-        NSString *output = [api echoNamedNullableString:arg_aNullableString error:&error];
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+            [api echoNullableNonNullClassMap:arg_classMap error:&error];
         callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// A no-op function taking no arguments and returning no value, to sanity
-  /// test basic asynchronous calling.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
                                                    @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.noopAsync",
+                                                   @"HostIntegrationCoreApi.echoNullableEnum",
                                                    messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(noopAsyncWithCompletion:)],
+      NSCAssert([api respondsToSelector:@selector(echoNullableEnum:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(noopAsyncWithCompletion:)",
+                @"@selector(echoNullableEnum:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        [api noopAsyncWithCompletion:^(FlutterError *_Nullable error) {
-          callback(wrapResult(nil, error));
-        }];
+        NSArray<id> *args = message;
+        FLTAnEnumBox *arg_anEnum = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        FLTAnEnumBox *output = [api echoNullableEnum:arg_anEnum error:&error];
+        callback(wrapResult(output, error));
       }];
     } else {
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns passed in int asynchronously.
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:@"%@%@",
-                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
-                                                   @"HostIntegrationCoreApi.echoAsyncInt",
-                                                   messageChannelSuffix]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoAnotherNullableEnum",
+                                             messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(echoAsyncInt:completion:)],
+      NSCAssert([api respondsToSelector:@selector(echoAnotherNullableEnum:error:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(echoAsyncInt:completion:)",
+                @"@selector(echoAnotherNullableEnum:error:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSInteger arg_anInt = [GetNullableObjectAtIndex(args, 0) integerValue];
-        [api echoAsyncInt:arg_anInt
-               completion:^(NSNumber *_Nullable output, FlutterError *_Nullable error) {
-                 callback(wrapResult(output, error));
-               }];
+        FLTAnotherEnumBox *arg_anotherEnum = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        FLTAnotherEnumBox *output = [api echoAnotherNullableEnum:arg_anotherEnum error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns passed in int.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoOptionalNullableInt",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoOptionalNullableInt:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoOptionalNullableInt:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSNumber *arg_aNullableInt = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSNumber *output = [api echoOptionalNullableInt:arg_aNullableInt error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns the passed in string.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.echoNamedNullableString",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoNamedNullableString:error:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoNamedNullableString:error:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSString *arg_aNullableString = GetNullableObjectAtIndex(args, 0);
+        FlutterError *error;
+        NSString *output = [api echoNamedNullableString:arg_aNullableString error:&error];
+        callback(wrapResult(output, error));
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// A no-op function taking no arguments and returning no value, to sanity
+  /// test basic asynchronous calling.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.noopAsync",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(noopAsyncWithCompletion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(noopAsyncWithCompletion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        [api noopAsyncWithCompletion:^(FlutterError *_Nullable error) {
+          callback(wrapResult(nil, error));
+        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  /// Returns passed in int asynchronously.
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:@"%@%@",
+                                                   @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                   @"HostIntegrationCoreApi.echoAsyncInt",
+                                                   messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(echoAsyncInt:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(echoAsyncInt:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSInteger arg_anInt = [GetNullableObjectAtIndex(args, 0) integerValue];
+        [api echoAsyncInt:arg_anInt
+               completion:^(NSNumber *_Nullable output, FlutterError *_Nullable error) {
+                 callback(wrapResult(output, error));
+               }];
       }];
     } else {
       [channel setMessageHandler:nil];
@@ -3367,6 +3712,60 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullEnumList",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullEnumList:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullEnumList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullEnumList:arg_enumList
+                                 completion:^(NSArray<FLTAnEnumBox *> *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                   callback(wrapResult(output, error));
+                                 }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullClassList",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullClassList:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullClassList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullClassList:arg_classList
+                                  completion:^(NSArray<FLTAllNullableTypes *> *_Nullable output,
+                                               FlutterError *_Nullable error) {
+                                    callback(wrapResult(output, error));
+                                  }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
@@ -3503,6 +3902,119 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullStringMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullStringMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullStringMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullStringMap:arg_stringMap
+                                  completion:^(
+                                      NSDictionary<NSString *, NSString *> *_Nullable output,
+                                      FlutterError *_Nullable error) {
+                                    callback(wrapResult(output, error));
+                                  }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.callFlutterEchoNonNullIntMap",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullIntMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullIntMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullIntMap:arg_intMap
+                               completion:^(NSDictionary<NSNumber *, NSNumber *> *_Nullable output,
+                                            FlutterError *_Nullable error) {
+                                 callback(wrapResult(output, error));
+                               }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullEnumMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullEnumMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullEnumMap:arg_enumMap
+                                completion:^(
+                                    NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable output,
+                                    FlutterError *_Nullable error) {
+                                  callback(wrapResult(output, error));
+                                }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString stringWithFormat:@"%@%@",
+                                          @"dev.flutter.pigeon.pigeon_integration_tests."
+                                          @"HostIntegrationCoreApi.callFlutterEchoNonNullClassMap",
+                                          messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNonNullClassMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNonNullClassMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNonNullClassMap:arg_classMap
+                                 completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                  *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                   callback(wrapResult(output, error));
+                                 }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString stringWithFormat:@"%@%@",
@@ -3776,25 +4288,27 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
-                            stringWithFormat:@"%@%@",
-                                             @"dev.flutter.pigeon.pigeon_integration_tests."
-                                             @"HostIntegrationCoreApi.callFlutterEchoNullableMap",
-                                             messageChannelSuffix]
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList",
+                                messageChannelSuffix]
         binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableMap:completion:)],
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullEnumList:
+                                                                              completion:)],
                 @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
-                @"@selector(callFlutterEchoNullableMap:completion:)",
+                @"@selector(callFlutterEchoNullableNonNullEnumList:completion:)",
                 api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray<id> *args = message;
-        NSDictionary<id, id> *arg_map = GetNullableObjectAtIndex(args, 0);
-        [api callFlutterEchoNullableMap:arg_map
-                             completion:^(NSDictionary<id, id> *_Nullable output,
-                                          FlutterError *_Nullable error) {
-                               callback(wrapResult(output, error));
-                             }];
+        NSArray<FLTAnEnumBox *> *arg_enumList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullEnumList:arg_enumList
+                                         completion:^(NSArray<FLTAnEnumBox *> *_Nullable output,
+                                                      FlutterError *_Nullable error) {
+                                           callback(wrapResult(output, error));
+                                         }];
       }];
     } else {
       [channel setMessageHandler:nil];
@@ -3802,12 +4316,69 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
   }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:
-                                      @"%@%@",
-                                      @"dev.flutter.pigeon.pigeon_integration_tests."
-                                      @"HostIntegrationCoreApi.callFlutterEchoNullableStringMap",
-                                      messageChannelSuffix]
-        binaryMessenger:binaryMessenger
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullClassList:
+                                                                               completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullClassList:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSArray<FLTAllNullableTypes *> *arg_classList = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullClassList:arg_classList
+                                          completion:^(
+                                              NSArray<FLTAllNullableTypes *> *_Nullable output,
+                                              FlutterError *_Nullable error) {
+                                            callback(wrapResult(output, error));
+                                          }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:@"%@%@",
+                                             @"dev.flutter.pigeon.pigeon_integration_tests."
+                                             @"HostIntegrationCoreApi.callFlutterEchoNullableMap",
+                                             messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableMap:completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<id, id> *arg_map = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableMap:arg_map
+                             completion:^(NSDictionary<id, id> *_Nullable output,
+                                          FlutterError *_Nullable error) {
+                               callback(wrapResult(output, error));
+                             }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString stringWithFormat:
+                                      @"%@%@",
+                                      @"dev.flutter.pigeon.pigeon_integration_tests."
+                                      @"HostIntegrationCoreApi.callFlutterEchoNullableStringMap",
+                                      messageChannelSuffix]
+        binaryMessenger:binaryMessenger
                   codec:FLTGetCoreTestsCodec()];
     if (api) {
       NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableStringMap:completion:)],
@@ -3913,6 +4484,130 @@ void SetUpFLTHostIntegrationCoreApiWithSuffix(id<FlutterBinaryMessenger> binaryM
       [channel setMessageHandler:nil];
     }
   }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullStringMap:
+                                                                               completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullStringMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSString *, NSString *> *arg_stringMap = GetNullableObjectAtIndex(args, 0);
+        [api
+            callFlutterEchoNullableNonNullStringMap:arg_stringMap
+                                         completion:^(
+                                             NSDictionary<NSString *, NSString *> *_Nullable output,
+                                             FlutterError *_Nullable error) {
+                                           callback(wrapResult(output, error));
+                                         }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString
+                   stringWithFormat:@"%@%@",
+                                    @"dev.flutter.pigeon.pigeon_integration_tests."
+                                    @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap",
+                                    messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullIntMap:
+                                                                            completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullIntMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, NSNumber *> *arg_intMap = GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullIntMap:arg_intMap
+                                       completion:^(
+                                           NSDictionary<NSNumber *, NSNumber *> *_Nullable output,
+                                           FlutterError *_Nullable error) {
+                                         callback(wrapResult(output, error));
+                                       }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:
+               [NSString
+                   stringWithFormat:@"%@%@",
+                                    @"dev.flutter.pigeon.pigeon_integration_tests."
+                                    @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap",
+                                    messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullEnumMap:
+                                                                             completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullEnumMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *arg_enumMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api callFlutterEchoNullableNonNullEnumMap:arg_enumMap
+                                        completion:^(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *>
+                                                         *_Nullable output,
+                                                     FlutterError *_Nullable error) {
+                                          callback(wrapResult(output, error));
+                                        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
+  {
+    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
+           initWithName:[NSString
+                            stringWithFormat:
+                                @"%@%@",
+                                @"dev.flutter.pigeon.pigeon_integration_tests."
+                                @"HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap",
+                                messageChannelSuffix]
+        binaryMessenger:binaryMessenger
+                  codec:FLTGetCoreTestsCodec()];
+    if (api) {
+      NSCAssert([api respondsToSelector:@selector(callFlutterEchoNullableNonNullClassMap:
+                                                                              completion:)],
+                @"FLTHostIntegrationCoreApi api (%@) doesn't respond to "
+                @"@selector(callFlutterEchoNullableNonNullClassMap:completion:)",
+                api);
+      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
+        NSArray<id> *args = message;
+        NSDictionary<NSNumber *, FLTAllNullableTypes *> *arg_classMap =
+            GetNullableObjectAtIndex(args, 0);
+        [api
+            callFlutterEchoNullableNonNullClassMap:arg_classMap
+                                        completion:^(NSDictionary<NSNumber *, FLTAllNullableTypes *>
+                                                         *_Nullable output,
+                                                     FlutterError *_Nullable error) {
+                                          callback(wrapResult(output, error));
+                                        }];
+      }];
+    } else {
+      [channel setMessageHandler:nil];
+    }
+  }
   {
     FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
            initWithName:[NSString
@@ -4466,6 +5161,63 @@ - (void)echoClassList:(NSArray<FLTAllNullableTypes *> *)arg_classList
                    }
                  }];
 }
+- (void)echoNonNullEnumList:(NSArray<FLTAnEnumBox *> *)arg_enumList
+                 completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                      FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullEnumList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAnEnumBox *> *output = reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullClassList:(NSArray<FLTAllNullableTypes *> *)arg_classList
+                  completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullClassList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoMap:(NSDictionary<id, id> *)arg_map
      completion:(void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
@@ -4608,6 +5360,121 @@ - (void)echoClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_clas
                    }
                  }];
 }
+- (void)echoNonNullStringMap:(NSDictionary<NSString *, NSString *> *)arg_stringMap
+                  completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullStringMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_stringMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSString *, NSString *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullIntMap:(NSDictionary<NSNumber *, NSNumber *> *)arg_intMap
+               completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                    FlutterError *_Nullable))completion {
+  NSString *channelName = [NSString stringWithFormat:@"%@%@",
+                                                     @"dev.flutter.pigeon.pigeon_integration_tests."
+                                                     @"FlutterIntegrationCoreApi.echoNonNullIntMap",
+                                                     _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_intMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, NSNumber *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullEnumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)arg_enumMap
+                completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                     FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullEnumMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNonNullClassMap:(NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_classMap
+                 completion:(void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                      FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNonNullClassMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoEnum:(FLTAnEnum)arg_anEnum
       completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
@@ -4884,6 +5751,63 @@ - (void)echoNullableClassList:(nullable NSArray<FLTAllNullableTypes *> *)arg_cla
                    }
                  }];
 }
+- (void)echoNullableNonNullEnumList:(nullable NSArray<FLTAnEnumBox *> *)arg_enumList
+                         completion:(void (^)(NSArray<FLTAnEnumBox *> *_Nullable,
+                                              FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullEnumList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAnEnumBox *> *output = reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullClassList:(nullable NSArray<FLTAllNullableTypes *> *)arg_classList
+                          completion:(void (^)(NSArray<FLTAllNullableTypes *> *_Nullable,
+                                               FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullClassList",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classList ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSArray<FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoNullableMap:(nullable NSDictionary<id, id> *)arg_map
              completion:
                  (void (^)(NSDictionary<id, id> *_Nullable, FlutterError *_Nullable))completion {
@@ -5029,6 +5953,125 @@ - (void)echoNullableClassMap:
                    }
                  }];
 }
+- (void)echoNullableNonNullStringMap:(nullable NSDictionary<NSString *, NSString *> *)arg_stringMap
+                          completion:(void (^)(NSDictionary<NSString *, NSString *> *_Nullable,
+                                               FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullStringMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_stringMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSString *, NSString *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullIntMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)arg_intMap
+                       completion:(void (^)(NSDictionary<NSNumber *, NSNumber *> *_Nullable,
+                                            FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullIntMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_intMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, NSNumber *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)
+    echoNullableNonNullEnumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)arg_enumMap
+                    completion:(void (^)(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *_Nullable,
+                                         FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullEnumMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_enumMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
+- (void)echoNullableNonNullClassMap:
+            (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)arg_classMap
+                         completion:
+                             (void (^)(NSDictionary<NSNumber *, FLTAllNullableTypes *> *_Nullable,
+                                       FlutterError *_Nullable))completion {
+  NSString *channelName =
+      [NSString stringWithFormat:@"%@%@",
+                                 @"dev.flutter.pigeon.pigeon_integration_tests."
+                                 @"FlutterIntegrationCoreApi.echoNullableNonNullClassMap",
+                                 _messageChannelSuffix];
+  FlutterBasicMessageChannel *channel =
+      [FlutterBasicMessageChannel messageChannelWithName:channelName
+                                         binaryMessenger:self.binaryMessenger
+                                                   codec:FLTGetCoreTestsCodec()];
+  [channel sendMessage:@[ arg_classMap ?: [NSNull null] ]
+                 reply:^(NSArray<id> *reply) {
+                   if (reply != nil) {
+                     if (reply.count > 1) {
+                       completion(nil, [FlutterError errorWithCode:reply[0]
+                                                           message:reply[1]
+                                                           details:reply[2]]);
+                     } else {
+                       NSDictionary<NSNumber *, FLTAllNullableTypes *> *output =
+                           reply[0] == [NSNull null] ? nil : reply[0];
+                       completion(output, nil);
+                     }
+                   } else {
+                     completion(nil, createConnectionError(channelName));
+                   }
+                 }];
+}
 - (void)echoNullableEnum:(nullable FLTAnEnumBox *)arg_anEnum
               completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion {
   NSString *channelName = [NSString
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart
index aad37a6aa6c..763e7b222c5 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// ignore_for_file: unused_local_variable
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -75,26 +77,26 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      final AllNullableTypes nullableListTypes =
+      final AllNullableTypes listTypes =
           AllNullableTypes(list: <String?>['String', null]);
 
       final AllNullableTypes? echoNullFilledClass =
-          await api.echoAllNullableTypes(nullableListTypes);
+          await api.echoAllNullableTypes(listTypes);
 
-      compareAllNullableTypes(nullableListTypes, echoNullFilledClass);
+      compareAllNullableTypes(listTypes, echoNullFilledClass);
     });
 
     testWidgets('Classes with map of null serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      final AllNullableTypes nullableListTypes = AllNullableTypes(
+      final AllNullableTypes listTypes = AllNullableTypes(
           map: <String?, String?>{'String': 'string', 'null': null});
 
       final AllNullableTypes? echoNullFilledClass =
-          await api.echoAllNullableTypes(nullableListTypes);
+          await api.echoAllNullableTypes(listTypes);
 
-      compareAllNullableTypes(nullableListTypes, echoNullFilledClass);
+      compareAllNullableTypes(listTypes, echoNullFilledClass);
     });
 
     testWidgets(
@@ -129,16 +131,15 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      final AllNullableTypesWithoutRecursion nullableListTypes =
+      final AllNullableTypesWithoutRecursion listTypes =
           AllNullableTypesWithoutRecursion(
         list: <String?>['String', null],
       );
 
       final AllNullableTypesWithoutRecursion? echoNullFilledClass =
-          await api.echoAllNullableTypesWithoutRecursion(nullableListTypes);
+          await api.echoAllNullableTypesWithoutRecursion(listTypes);
 
-      compareAllNullableTypesWithoutRecursion(
-          nullableListTypes, echoNullFilledClass);
+      compareAllNullableTypesWithoutRecursion(listTypes, echoNullFilledClass);
     });
 
     testWidgets(
@@ -146,16 +147,15 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      final AllNullableTypesWithoutRecursion nullableListTypes =
+      final AllNullableTypesWithoutRecursion listTypes =
           AllNullableTypesWithoutRecursion(
         map: <String?, String?>{'String': 'string', 'null': null},
       );
 
       final AllNullableTypesWithoutRecursion? echoNullFilledClass =
-          await api.echoAllNullableTypesWithoutRecursion(nullableListTypes);
+          await api.echoAllNullableTypesWithoutRecursion(listTypes);
 
-      compareAllNullableTypesWithoutRecursion(
-          nullableListTypes, echoNullFilledClass);
+      compareAllNullableTypesWithoutRecursion(listTypes, echoNullFilledClass);
     });
 
     testWidgets('errors are returned correctly', (WidgetTester _) async {
@@ -388,6 +388,26 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets('NonNull enum lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AnEnum> echoObject =
+          await api.echoNonNullEnumList(nonNullEnumList);
+      expect(listEquals(echoObject, nonNullEnumList), true);
+    });
+
+    testWidgets('NonNull class lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AllNullableTypes> echoObject =
+          await api.echoNonNullClassList(nonNullAllNullableTypesList);
+      for (final (int index, AllNullableTypes value) in echoObject.indexed) {
+        compareAllNullableTypes(value, nonNullAllNullableTypesList[index]);
+      }
+    });
+
     testWidgets('maps serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -428,6 +448,41 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets('NonNull string maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<String, String> echoObject =
+          await api.echoNonNullStringMap(nonNullStringMap);
+      expect(mapEquals(echoObject, nonNullStringMap), true);
+    });
+
+    testWidgets('NonNull int maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int, int> echoObject =
+          await api.echoNonNullIntMap(nonNullIntMap);
+      expect(mapEquals(echoObject, nonNullIntMap), true);
+    });
+
+    testWidgets('NonNull enum maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<AnEnum, AnEnum> echoObject =
+          await api.echoNonNullEnumMap(nonNullEnumMap);
+      expect(mapEquals(echoObject, nonNullEnumMap), true);
+    });
+
+    testWidgets('NonNull class maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int, AllNullableTypes> echoObject =
+          await api.echoNonNullClassMap(nonNullAllNullableTypesMap);
+      for (final MapEntry<int, AllNullableTypes> entry in echoObject.entries) {
+        compareAllNullableTypes(
+            entry.value, nonNullAllNullableTypesMap[entry.key]);
+      }
+    });
+
     testWidgets('enums serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -655,6 +710,27 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets(
+        'nullable NonNull enum lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AnEnum?>? echoObject =
+          await api.echoNullableNonNullEnumList(nonNullEnumList);
+      expect(listEquals(echoObject, nonNullEnumList), true);
+    });
+
+    testWidgets('nullable NonNull lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AllNullableTypes?>? echoObject =
+          await api.echoNullableClassList(nonNullAllNullableTypesList);
+      for (final (int index, AllNullableTypes? value) in echoObject!.indexed) {
+        compareAllNullableTypes(value, nonNullAllNullableTypesList[index]);
+      }
+    });
+
     testWidgets('nullable maps serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -696,6 +772,45 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets(
+        'nullable NonNull string maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<String?, String?>? echoObject =
+          await api.echoNullableNonNullStringMap(nonNullStringMap);
+      expect(mapEquals(echoObject, nonNullStringMap), true);
+    });
+
+    testWidgets('nullable NonNull int maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int?, int?>? echoObject =
+          await api.echoNullableNonNullIntMap(nonNullIntMap);
+      expect(mapEquals(echoObject, nonNullIntMap), true);
+    });
+
+    testWidgets(
+        'nullable NonNull enum maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<AnEnum?, AnEnum?>? echoObject =
+          await api.echoNullableNonNullEnumMap(nonNullEnumMap);
+      expect(mapEquals(echoObject, nonNullEnumMap), true);
+    });
+
+    testWidgets(
+        'nullable NonNull class maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int?, AllNullableTypes?>? echoObject =
+          await api.echoNullableNonNullClassMap(nonNullAllNullableTypesMap);
+      for (final MapEntry<int?, AllNullableTypes?> entry
+          in echoObject!.entries) {
+        compareAllNullableTypes(
+            entry.value, nonNullAllNullableTypesMap[entry.key]);
+      }
+    });
+
     testWidgets('nullable enums serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -1597,6 +1712,26 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets('NonNull enum lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AnEnum> echoObject =
+          await api.callFlutterEchoNonNullEnumList(nonNullEnumList);
+      expect(listEquals(echoObject, nonNullEnumList), true);
+    });
+
+    testWidgets('NonNull class lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AllNullableTypes> echoObject = await api
+          .callFlutterEchoNonNullClassList(nonNullAllNullableTypesList);
+      for (final (int index, AllNullableTypes? value) in echoObject.indexed) {
+        compareAllNullableTypes(value, nonNullAllNullableTypesList[index]);
+      }
+    });
+
     testWidgets('maps serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -1640,6 +1775,41 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets('NonNull string maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<String, String> echoObject =
+          await api.callFlutterEchoNonNullStringMap(nonNullStringMap);
+      expect(mapEquals(echoObject, nonNullStringMap), true);
+    });
+
+    testWidgets('NonNull int maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int, int> echoObject =
+          await api.callFlutterEchoNonNullIntMap(nonNullIntMap);
+      expect(mapEquals(echoObject, nonNullIntMap), true);
+    });
+
+    testWidgets('NonNull enum maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<AnEnum, AnEnum> echoObject =
+          await api.callFlutterEchoNonNullEnumMap(nonNullEnumMap);
+      expect(mapEquals(echoObject, nonNullEnumMap), true);
+    });
+
+    testWidgets('NonNull class maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int, AllNullableTypes> echoObject =
+          await api.callFlutterEchoNonNullClassMap(nonNullAllNullableTypesMap);
+      for (final MapEntry<int, AllNullableTypes> entry in echoObject.entries) {
+        compareAllNullableTypes(
+            entry.value, nonNullAllNullableTypesMap[entry.key]);
+      }
+    });
+
     testWidgets('enums serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -1810,6 +1980,28 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets(
+        'nullable NonNull enum lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AnEnum?>? echoObject =
+          await api.callFlutterEchoNullableNonNullEnumList(nonNullEnumList);
+      expect(listEquals(echoObject, nonNullEnumList), true);
+    });
+
+    testWidgets(
+        'nullable NonNull class lists serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+
+      final List<AllNullableTypes?>? echoObject = await api
+          .callFlutterEchoNullableNonNullClassList(nonNullAllNullableTypesList);
+      for (final (int index, AllNullableTypes? value) in echoObject!.indexed) {
+        compareAllNullableTypes(value, nonNullAllNullableTypesList[index]);
+      }
+    });
+
     testWidgets('null lists serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -1871,6 +2063,45 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
       }
     });
 
+    testWidgets(
+        'nullable NonNull string maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<String?, String?>? echoObject =
+          await api.callFlutterEchoNullableNonNullStringMap(nonNullStringMap);
+      expect(mapEquals(echoObject, nonNullStringMap), true);
+    });
+
+    testWidgets('nullable NonNull int maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int?, int?>? echoObject =
+          await api.callFlutterEchoNullableNonNullIntMap(nonNullIntMap);
+      expect(mapEquals(echoObject, nonNullIntMap), true);
+    });
+
+    testWidgets(
+        'nullable NonNull enum maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<AnEnum?, AnEnum?>? echoObject =
+          await api.callFlutterEchoNullableNonNullEnumMap(nonNullEnumMap);
+      expect(mapEquals(echoObject, nonNullEnumMap), true);
+    });
+
+    testWidgets(
+        'nullable NonNull class maps serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final HostIntegrationCoreApi api = HostIntegrationCoreApi();
+      final Map<int?, AllNullableTypes?>? echoObject = await api
+          .callFlutterEchoNullableNonNullClassMap(nonNullAllNullableTypesMap);
+      for (final MapEntry<int?, AllNullableTypes?> entry
+          in echoObject!.entries) {
+        compareAllNullableTypes(
+            entry.value, nonNullAllNullableTypesMap[entry.key]);
+      }
+    });
+
     testWidgets('null maps serialize and deserialize correctly',
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
@@ -2025,7 +2256,7 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
     testWidgets('echoProxyApiList', (_) async {
       final ProxyApiTestClass api = _createGenericProxyApiTestClass();
 
-      final List<ProxyApiTestClass?> value = <ProxyApiTestClass?>[
+      final List<ProxyApiTestClass> value = <ProxyApiTestClass>[
         _createGenericProxyApiTestClass(),
         _createGenericProxyApiTestClass(),
       ];
@@ -2042,8 +2273,7 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
     testWidgets('echoProxyApiMap', (_) async {
       final ProxyApiTestClass api = _createGenericProxyApiTestClass();
 
-      final Map<String?, ProxyApiTestClass?> value =
-          <String?, ProxyApiTestClass?>{
+      final Map<String, ProxyApiTestClass> value = <String, ProxyApiTestClass>{
         '42': _createGenericProxyApiTestClass(),
       };
       expect(await api.echoProxyApiMap(value), value);
@@ -2680,6 +2910,15 @@ class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi {
     return classList;
   }
 
+  @override
+  List<AnEnum> echoNonNullEnumList(List<AnEnum> enumList) => enumList;
+
+  @override
+  List<AllNullableTypes> echoNonNullClassList(
+      List<AllNullableTypes> classList) {
+    return classList;
+  }
+
   @override
   Map<Object?, Object?> echoMap(Map<Object?, Object?> map) => map;
 
@@ -2699,6 +2938,23 @@ class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi {
     return classMap;
   }
 
+  @override
+  Map<String, String> echoNonNullStringMap(Map<String, String> stringMap) =>
+      stringMap;
+
+  @override
+  Map<int, int> echoNonNullIntMap(Map<int, int> intMap) => intMap;
+
+  @override
+  Map<AnEnum, AnEnum> echoNonNullEnumMap(Map<AnEnum, AnEnum> enumMap) =>
+      enumMap;
+
+  @override
+  Map<int, AllNullableTypes> echoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap) {
+    return classMap;
+  }
+
   @override
   AnEnum echoEnum(AnEnum anEnum) => anEnum;
 
@@ -2726,6 +2982,17 @@ class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi {
     return classList;
   }
 
+  @override
+  List<AnEnum>? echoNullableNonNullEnumList(List<AnEnum>? enumList) {
+    return enumList;
+  }
+
+  @override
+  List<AllNullableTypes>? echoNullableNonNullClassList(
+      List<AllNullableTypes>? classList) {
+    return classList;
+  }
+
   @override
   Map<Object?, Object?>? echoNullableMap(Map<Object?, Object?>? map) => map;
 
@@ -2749,6 +3016,29 @@ class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi {
     return classMap;
   }
 
+  @override
+  Map<String, String>? echoNullableNonNullStringMap(
+      Map<String, String>? stringMap) {
+    return stringMap;
+  }
+
+  @override
+  Map<int, int>? echoNullableNonNullIntMap(Map<int, int>? intMap) {
+    return intMap;
+  }
+
+  @override
+  Map<AnEnum, AnEnum>? echoNullableNonNullEnumMap(
+      Map<AnEnum, AnEnum>? enumMap) {
+    return enumMap;
+  }
+
+  @override
+  Map<int, AllNullableTypes>? echoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap) {
+    return classMap;
+  }
+
   @override
   String? echoNullableString(String? aString) => aString;
 
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
index bd2ea7d4c7f..c2a98def00a 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
@@ -84,11 +84,13 @@ class AllTypes {
     required this.doubleList,
     required this.boolList,
     required this.enumList,
+    required this.objectList,
     required this.listList,
     required this.map,
     required this.stringMap,
     required this.intMap,
     required this.enumMap,
+    required this.objectMap,
   });
 
   bool aBool;
@@ -117,25 +119,29 @@ class AllTypes {
 
   List<Object?> list;
 
-  List<String?> stringList;
+  List<String> stringList;
 
-  List<int?> intList;
+  List<int> intList;
 
-  List<double?> doubleList;
+  List<double> doubleList;
 
-  List<bool?> boolList;
+  List<bool> boolList;
 
-  List<AnEnum?> enumList;
+  List<AnEnum> enumList;
 
-  List<List<Object?>?> listList;
+  List<Object> objectList;
+
+  List<List<Object?>> listList;
 
   Map<Object?, Object?> map;
 
-  Map<String?, String?> stringMap;
+  Map<String, String> stringMap;
+
+  Map<int, int> intMap;
 
-  Map<int?, int?> intMap;
+  Map<AnEnum, AnEnum> enumMap;
 
-  Map<AnEnum?, AnEnum?> enumMap;
+  Map<Object, Object> objectMap;
 
   Object encode() {
     return <Object?>[
@@ -157,11 +163,13 @@ class AllTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ];
   }
 
@@ -181,17 +189,18 @@ class AllTypes {
       aString: result[10]! as String,
       anObject: result[11]!,
       list: result[12]! as List<Object?>,
-      stringList: (result[13] as List<Object?>?)!.cast<String?>(),
-      intList: (result[14] as List<Object?>?)!.cast<int?>(),
-      doubleList: (result[15] as List<Object?>?)!.cast<double?>(),
-      boolList: (result[16] as List<Object?>?)!.cast<bool?>(),
-      enumList: (result[17] as List<Object?>?)!.cast<AnEnum?>(),
-      listList: (result[18] as List<Object?>?)!.cast<List<Object?>?>(),
-      map: result[19]! as Map<Object?, Object?>,
-      stringMap:
-          (result[20] as Map<Object?, Object?>?)!.cast<String?, String?>(),
-      intMap: (result[21] as Map<Object?, Object?>?)!.cast<int?, int?>(),
-      enumMap: (result[22] as Map<Object?, Object?>?)!.cast<AnEnum?, AnEnum?>(),
+      stringList: (result[13] as List<Object?>?)!.cast<String>(),
+      intList: (result[14] as List<Object?>?)!.cast<int>(),
+      doubleList: (result[15] as List<Object?>?)!.cast<double>(),
+      boolList: (result[16] as List<Object?>?)!.cast<bool>(),
+      enumList: (result[17] as List<Object?>?)!.cast<AnEnum>(),
+      objectList: (result[18] as List<Object?>?)!.cast<Object>(),
+      listList: (result[19] as List<Object?>?)!.cast<List<Object?>>(),
+      map: result[20]! as Map<Object?, Object?>,
+      stringMap: (result[21] as Map<Object?, Object?>?)!.cast<String, String>(),
+      intMap: (result[22] as Map<Object?, Object?>?)!.cast<int, int>(),
+      enumMap: (result[23] as Map<Object?, Object?>?)!.cast<AnEnum, AnEnum>(),
+      objectMap: (result[24] as Map<Object?, Object?>?)!.cast<Object, Object>(),
     );
   }
 }
@@ -218,12 +227,14 @@ class AllNullableTypes {
     this.doubleList,
     this.boolList,
     this.enumList,
+    this.objectList,
     this.listList,
     this.recursiveClassList,
     this.map,
     this.stringMap,
     this.intMap,
     this.enumMap,
+    this.objectMap,
     this.recursiveClassMap,
   });
 
@@ -265,6 +276,8 @@ class AllNullableTypes {
 
   List<AnEnum?>? enumList;
 
+  List<Object?>? objectList;
+
   List<List<Object?>?>? listList;
 
   List<AllNullableTypes?>? recursiveClassList;
@@ -277,6 +290,8 @@ class AllNullableTypes {
 
   Map<AnEnum?, AnEnum?>? enumMap;
 
+  Map<Object?, Object?>? objectMap;
+
   Map<int?, AllNullableTypes?>? recursiveClassMap;
 
   Object encode() {
@@ -300,12 +315,14 @@ class AllNullableTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
       recursiveClassMap,
     ];
   }
@@ -332,15 +349,18 @@ class AllNullableTypes {
       doubleList: (result[16] as List<Object?>?)?.cast<double?>(),
       boolList: (result[17] as List<Object?>?)?.cast<bool?>(),
       enumList: (result[18] as List<Object?>?)?.cast<AnEnum?>(),
-      listList: (result[19] as List<Object?>?)?.cast<List<Object?>?>(),
+      objectList: (result[19] as List<Object?>?)?.cast<Object?>(),
+      listList: (result[20] as List<Object?>?)?.cast<List<Object?>?>(),
       recursiveClassList:
-          (result[20] as List<Object?>?)?.cast<AllNullableTypes?>(),
-      map: result[21] as Map<Object?, Object?>?,
+          (result[21] as List<Object?>?)?.cast<AllNullableTypes?>(),
+      map: result[22] as Map<Object?, Object?>?,
       stringMap:
-          (result[22] as Map<Object?, Object?>?)?.cast<String?, String?>(),
-      intMap: (result[23] as Map<Object?, Object?>?)?.cast<int?, int?>(),
-      enumMap: (result[24] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
-      recursiveClassMap: (result[25] as Map<Object?, Object?>?)
+          (result[23] as Map<Object?, Object?>?)?.cast<String?, String?>(),
+      intMap: (result[24] as Map<Object?, Object?>?)?.cast<int?, int?>(),
+      enumMap: (result[25] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
+      objectMap:
+          (result[26] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
+      recursiveClassMap: (result[27] as Map<Object?, Object?>?)
           ?.cast<int?, AllNullableTypes?>(),
     );
   }
@@ -369,11 +389,13 @@ class AllNullableTypesWithoutRecursion {
     this.doubleList,
     this.boolList,
     this.enumList,
+    this.objectList,
     this.listList,
     this.map,
     this.stringMap,
     this.intMap,
     this.enumMap,
+    this.objectMap,
   });
 
   bool? aNullableBool;
@@ -412,6 +434,8 @@ class AllNullableTypesWithoutRecursion {
 
   List<AnEnum?>? enumList;
 
+  List<Object?>? objectList;
+
   List<List<Object?>?>? listList;
 
   Map<Object?, Object?>? map;
@@ -422,6 +446,8 @@ class AllNullableTypesWithoutRecursion {
 
   Map<AnEnum?, AnEnum?>? enumMap;
 
+  Map<Object?, Object?>? objectMap;
+
   Object encode() {
     return <Object?>[
       aNullableBool,
@@ -442,11 +468,13 @@ class AllNullableTypesWithoutRecursion {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ];
   }
 
@@ -471,12 +499,15 @@ class AllNullableTypesWithoutRecursion {
       doubleList: (result[15] as List<Object?>?)?.cast<double?>(),
       boolList: (result[16] as List<Object?>?)?.cast<bool?>(),
       enumList: (result[17] as List<Object?>?)?.cast<AnEnum?>(),
-      listList: (result[18] as List<Object?>?)?.cast<List<Object?>?>(),
-      map: result[19] as Map<Object?, Object?>?,
+      objectList: (result[18] as List<Object?>?)?.cast<Object?>(),
+      listList: (result[19] as List<Object?>?)?.cast<List<Object?>?>(),
+      map: result[20] as Map<Object?, Object?>?,
       stringMap:
-          (result[20] as Map<Object?, Object?>?)?.cast<String?, String?>(),
-      intMap: (result[21] as Map<Object?, Object?>?)?.cast<int?, int?>(),
-      enumMap: (result[22] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
+          (result[21] as Map<Object?, Object?>?)?.cast<String?, String?>(),
+      intMap: (result[22] as Map<Object?, Object?>?)?.cast<int?, int?>(),
+      enumMap: (result[23] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
+      objectMap:
+          (result[24] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
     );
   }
 }
@@ -1045,6 +1076,68 @@ class HostIntegrationCoreApi {
     }
   }
 
+  /// Returns the passed list, to test serialization and deserialization.
+  Future<List<AnEnum>> echoNonNullEnumList(List<AnEnum> enumList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)!.cast<AnEnum>();
+    }
+  }
+
+  /// Returns the passed list, to test serialization and deserialization.
+  Future<List<AllNullableTypes>> echoNonNullClassList(
+      List<AllNullableTypes> classList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)!
+          .cast<AllNullableTypes>();
+    }
+  }
+
   /// Returns the passed map, to test serialization and deserialization.
   Future<Map<Object?, Object?>> echoMap(Map<Object?, Object?> map) async {
     final String pigeonVar_channelName =
@@ -1203,6 +1296,133 @@ class HostIntegrationCoreApi {
     }
   }
 
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<String, String>> echoNonNullStringMap(
+      Map<String, String> stringMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullStringMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[stringMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<String, String>();
+    }
+  }
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<int, int>> echoNonNullIntMap(Map<int, int> intMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullIntMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[intMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<int, int>();
+    }
+  }
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<AnEnum, AnEnum>> echoNonNullEnumMap(
+      Map<AnEnum, AnEnum> enumMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<AnEnum, AnEnum>();
+    }
+  }
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<int, AllNullableTypes>> echoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<int, AllNullableTypes>();
+    }
+  }
+
   /// Returns the passed class to test nested class serialization and deserialization.
   Future<AllClassesWrapper> echoClassWrapper(AllClassesWrapper wrapper) async {
     final String pigeonVar_channelName =
@@ -1787,6 +2007,59 @@ class HostIntegrationCoreApi {
     }
   }
 
+  /// Returns the passed list, to test serialization and deserialization.
+  Future<List<AnEnum>?> echoNullableNonNullEnumList(
+      List<AnEnum>? enumList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<AnEnum>();
+    }
+  }
+
+  /// Returns the passed list, to test serialization and deserialization.
+  Future<List<AllNullableTypes>?> echoNullableNonNullClassList(
+      List<AllNullableTypes>? classList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)
+          ?.cast<AllNullableTypes>();
+    }
+  }
+
   /// Returns the passed map, to test serialization and deserialization.
   Future<Map<Object?, Object?>?> echoNullableMap(
       Map<Object?, Object?>? map) async {
@@ -1921,9 +2194,11 @@ class HostIntegrationCoreApi {
     }
   }
 
-  Future<AnEnum?> echoNullableEnum(AnEnum? anEnum) async {
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<String, String>?> echoNullableNonNullStringMap(
+      Map<String, String>? stringMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullStringMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -1931,7 +2206,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[anEnum]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[stringMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -1941,13 +2216,16 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as AnEnum?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<String, String>();
     }
   }
 
-  Future<AnotherEnum?> echoAnotherNullableEnum(AnotherEnum? anotherEnum) async {
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<int, int>?> echoNullableNonNullIntMap(
+      Map<int, int>? intMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullIntMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -1955,7 +2233,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[anotherEnum]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[intMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -1965,14 +2243,16 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as AnotherEnum?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<int, int>();
     }
   }
 
-  /// Returns passed in int.
-  Future<int?> echoOptionalNullableInt([int? aNullableInt]) async {
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<AnEnum, AnEnum>?> echoNullableNonNullEnumMap(
+      Map<AnEnum, AnEnum>? enumMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -1980,7 +2260,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[aNullableInt]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[enumMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -1990,22 +2270,24 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as int?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<AnEnum, AnEnum>();
     }
   }
 
-  /// Returns the passed in string.
-  Future<String?> echoNamedNullableString({String? aNullableString}) async {
+  /// Returns the passed map, to test serialization and deserialization.
+  Future<Map<int, AllNullableTypes>?> echoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_channel
-        .send(<Object?>[aNullableString]) as List<Object?>?;
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -2015,13 +2297,112 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as String?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<int, AllNullableTypes>();
     }
   }
 
-  /// A no-op function taking no arguments and returning no value, to sanity
-  /// test basic asynchronous calling.
-  Future<void> noopAsync() async {
+  Future<AnEnum?> echoNullableEnum(AnEnum? anEnum) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[anEnum]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as AnEnum?);
+    }
+  }
+
+  Future<AnotherEnum?> echoAnotherNullableEnum(AnotherEnum? anotherEnum) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[anotherEnum]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as AnotherEnum?);
+    }
+  }
+
+  /// Returns passed in int.
+  Future<int?> echoOptionalNullableInt([int? aNullableInt]) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[aNullableInt]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as int?);
+    }
+  }
+
+  /// Returns the passed in string.
+  Future<String?> echoNamedNullableString({String? aNullableString}) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_channel
+        .send(<Object?>[aNullableString]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as String?);
+    }
+  }
+
+  /// A no-op function taking no arguments and returning no value, to sanity
+  /// test basic asynchronous calling.
+  Future<void> noopAsync() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
@@ -3556,6 +3937,67 @@ class HostIntegrationCoreApi {
     }
   }
 
+  Future<List<AnEnum>> callFlutterEchoNonNullEnumList(
+      List<AnEnum> enumList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)!.cast<AnEnum>();
+    }
+  }
+
+  Future<List<AllNullableTypes>> callFlutterEchoNonNullClassList(
+      List<AllNullableTypes> classList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)!
+          .cast<AllNullableTypes>();
+    }
+  }
+
   Future<Map<Object?, Object?>> callFlutterEchoMap(
       Map<Object?, Object?> map) async {
     final String pigeonVar_channelName =
@@ -3710,9 +4152,10 @@ class HostIntegrationCoreApi {
     }
   }
 
-  Future<AnEnum> callFlutterEchoEnum(AnEnum anEnum) async {
+  Future<Map<String, String>> callFlutterEchoNonNullStringMap(
+      Map<String, String> stringMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullStringMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3720,7 +4163,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[anEnum]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[stringMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3735,14 +4178,15 @@ class HostIntegrationCoreApi {
         message: 'Host platform returned null value for non-null return value.',
       );
     } else {
-      return (pigeonVar_replyList[0] as AnEnum?)!;
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<String, String>();
     }
   }
 
-  Future<AnotherEnum> callFlutterEchoAnotherEnum(
-      AnotherEnum anotherEnum) async {
+  Future<Map<int, int>> callFlutterEchoNonNullIntMap(
+      Map<int, int> intMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullIntMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3750,7 +4194,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[anotherEnum]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[intMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3765,13 +4209,15 @@ class HostIntegrationCoreApi {
         message: 'Host platform returned null value for non-null return value.',
       );
     } else {
-      return (pigeonVar_replyList[0] as AnotherEnum?)!;
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<int, int>();
     }
   }
 
-  Future<bool?> callFlutterEchoNullableBool(bool? aBool) async {
+  Future<Map<AnEnum, AnEnum>> callFlutterEchoNonNullEnumMap(
+      Map<AnEnum, AnEnum> enumMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3779,7 +4225,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[aBool]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[enumMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3788,14 +4234,21 @@ class HostIntegrationCoreApi {
         message: pigeonVar_replyList[1] as String?,
         details: pigeonVar_replyList[2],
       );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
-      return (pigeonVar_replyList[0] as bool?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<AnEnum, AnEnum>();
     }
   }
 
-  Future<int?> callFlutterEchoNullableInt(int? anInt) async {
+  Future<Map<int, AllNullableTypes>> callFlutterEchoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3803,7 +4256,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[anInt]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[classMap]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3812,14 +4265,20 @@ class HostIntegrationCoreApi {
         message: pigeonVar_replyList[1] as String?,
         details: pigeonVar_replyList[2],
       );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
-      return (pigeonVar_replyList[0] as int?);
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
+          .cast<int, AllNullableTypes>();
     }
   }
 
-  Future<double?> callFlutterEchoNullableDouble(double? aDouble) async {
+  Future<AnEnum> callFlutterEchoEnum(AnEnum anEnum) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3827,7 +4286,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[aDouble]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[anEnum]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3836,14 +4295,20 @@ class HostIntegrationCoreApi {
         message: pigeonVar_replyList[1] as String?,
         details: pigeonVar_replyList[2],
       );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
-      return (pigeonVar_replyList[0] as double?);
+      return (pigeonVar_replyList[0] as AnEnum?)!;
     }
   }
 
-  Future<String?> callFlutterEchoNullableString(String? aString) async {
+  Future<AnotherEnum> callFlutterEchoAnotherEnum(
+      AnotherEnum anotherEnum) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3851,7 +4316,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[aString]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[anotherEnum]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3860,14 +4325,19 @@ class HostIntegrationCoreApi {
         message: pigeonVar_replyList[1] as String?,
         details: pigeonVar_replyList[2],
       );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
-      return (pigeonVar_replyList[0] as String?);
+      return (pigeonVar_replyList[0] as AnotherEnum?)!;
     }
   }
 
-  Future<Uint8List?> callFlutterEchoNullableUint8List(Uint8List? list) async {
+  Future<bool?> callFlutterEchoNullableBool(bool? aBool) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3875,7 +4345,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[list]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[aBool]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3885,14 +4355,13 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as Uint8List?);
+      return (pigeonVar_replyList[0] as bool?);
     }
   }
 
-  Future<List<Object?>?> callFlutterEchoNullableList(
-      List<Object?>? list) async {
+  Future<int?> callFlutterEchoNullableInt(int? anInt) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3900,7 +4369,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[list]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[anInt]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3910,14 +4379,13 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<Object?>();
+      return (pigeonVar_replyList[0] as int?);
     }
   }
 
-  Future<List<AnEnum?>?> callFlutterEchoNullableEnumList(
-      List<AnEnum?>? enumList) async {
+  Future<double?> callFlutterEchoNullableDouble(double? aDouble) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3925,7 +4393,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[aDouble]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3935,14 +4403,13 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<AnEnum?>();
+      return (pigeonVar_replyList[0] as double?);
     }
   }
 
-  Future<List<AllNullableTypes?>?> callFlutterEchoNullableClassList(
-      List<AllNullableTypes?>? classList) async {
+  Future<String?> callFlutterEchoNullableString(String? aString) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -3950,7 +4417,7 @@ class HostIntegrationCoreApi {
       binaryMessenger: pigeonVar_binaryMessenger,
     );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[aString]) as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
@@ -3960,15 +4427,165 @@ class HostIntegrationCoreApi {
         details: pigeonVar_replyList[2],
       );
     } else {
-      return (pigeonVar_replyList[0] as List<Object?>?)
-          ?.cast<AllNullableTypes?>();
+      return (pigeonVar_replyList[0] as String?);
     }
   }
 
-  Future<Map<Object?, Object?>?> callFlutterEchoNullableMap(
-      Map<Object?, Object?>? map) async {
+  Future<Uint8List?> callFlutterEchoNullableUint8List(Uint8List? list) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[list]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Uint8List?);
+    }
+  }
+
+  Future<List<Object?>?> callFlutterEchoNullableList(
+      List<Object?>? list) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[list]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<Object?>();
+    }
+  }
+
+  Future<List<AnEnum?>?> callFlutterEchoNullableEnumList(
+      List<AnEnum?>? enumList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<AnEnum?>();
+    }
+  }
+
+  Future<List<AllNullableTypes?>?> callFlutterEchoNullableClassList(
+      List<AllNullableTypes?>? classList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)
+          ?.cast<AllNullableTypes?>();
+    }
+  }
+
+  Future<List<AnEnum>?> callFlutterEchoNullableNonNullEnumList(
+      List<AnEnum>? enumList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)?.cast<AnEnum>();
+    }
+  }
+
+  Future<List<AllNullableTypes>?> callFlutterEchoNullableNonNullClassList(
+      List<AllNullableTypes>? classList) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classList]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as List<Object?>?)
+          ?.cast<AllNullableTypes>();
+    }
+  }
+
+  Future<Map<Object?, Object?>?> callFlutterEchoNullableMap(
+      Map<Object?, Object?>? map) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
         BasicMessageChannel<Object?>(
       pigeonVar_channelName,
@@ -4095,6 +4712,110 @@ class HostIntegrationCoreApi {
     }
   }
 
+  Future<Map<String, String>?> callFlutterEchoNullableNonNullStringMap(
+      Map<String, String>? stringMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[stringMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<String, String>();
+    }
+  }
+
+  Future<Map<int, int>?> callFlutterEchoNullableNonNullIntMap(
+      Map<int, int>? intMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[intMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<int, int>();
+    }
+  }
+
+  Future<Map<AnEnum, AnEnum>?> callFlutterEchoNullableNonNullEnumMap(
+      Map<AnEnum, AnEnum>? enumMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[enumMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<AnEnum, AnEnum>();
+    }
+  }
+
+  Future<Map<int, AllNullableTypes>?> callFlutterEchoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel =
+        BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_channel.send(<Object?>[classMap]) as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)
+          ?.cast<int, AllNullableTypes>();
+    }
+  }
+
   Future<AnEnum?> callFlutterEchoNullableEnum(AnEnum? anEnum) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum$pigeonVar_messageChannelSuffix';
@@ -4235,6 +4956,12 @@ abstract class FlutterIntegrationCoreApi {
   /// Returns the passed list, to test serialization and deserialization.
   List<AllNullableTypes?> echoClassList(List<AllNullableTypes?> classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  List<AnEnum> echoNonNullEnumList(List<AnEnum> enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  List<AllNullableTypes> echoNonNullClassList(List<AllNullableTypes> classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   Map<Object?, Object?> echoMap(Map<Object?, Object?> map);
 
@@ -4251,6 +4978,19 @@ abstract class FlutterIntegrationCoreApi {
   Map<int?, AllNullableTypes?> echoClassMap(
       Map<int?, AllNullableTypes?> classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<String, String> echoNonNullStringMap(Map<String, String> stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<int, int> echoNonNullIntMap(Map<int, int> intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<AnEnum, AnEnum> echoNonNullEnumMap(Map<AnEnum, AnEnum> enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<int, AllNullableTypes> echoNonNullClassMap(
+      Map<int, AllNullableTypes> classMap);
+
   /// Returns the passed enum to test serialization and deserialization.
   AnEnum echoEnum(AnEnum anEnum);
 
@@ -4282,6 +5022,13 @@ abstract class FlutterIntegrationCoreApi {
   List<AllNullableTypes?>? echoNullableClassList(
       List<AllNullableTypes?>? classList);
 
+  /// Returns the passed list, to test serialization and deserialization.
+  List<AnEnum>? echoNullableNonNullEnumList(List<AnEnum>? enumList);
+
+  /// Returns the passed list, to test serialization and deserialization.
+  List<AllNullableTypes>? echoNullableNonNullClassList(
+      List<AllNullableTypes>? classList);
+
   /// Returns the passed map, to test serialization and deserialization.
   Map<Object?, Object?>? echoNullableMap(Map<Object?, Object?>? map);
 
@@ -4299,6 +5046,20 @@ abstract class FlutterIntegrationCoreApi {
   Map<int?, AllNullableTypes?>? echoNullableClassMap(
       Map<int?, AllNullableTypes?>? classMap);
 
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<String, String>? echoNullableNonNullStringMap(
+      Map<String, String>? stringMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<int, int>? echoNullableNonNullIntMap(Map<int, int>? intMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<AnEnum, AnEnum>? echoNullableNonNullEnumMap(Map<AnEnum, AnEnum>? enumMap);
+
+  /// Returns the passed map, to test serialization and deserialization.
+  Map<int, AllNullableTypes>? echoNullableNonNullClassMap(
+      Map<int, AllNullableTypes>? classMap);
+
   /// Returns the passed enum to test serialization and deserialization.
   AnEnum? echoNullableEnum(AnEnum? anEnum);
 
@@ -4583,7 +5344,185 @@ abstract class FlutterIntegrationCoreApi {
           assert(arg_anInt != null,
               'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.');
           try {
-            final int output = api.echoInt(arg_anInt!);
+            final int output = api.echoInt(arg_anInt!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final double? arg_aDouble = (args[0] as double?);
+          assert(arg_aDouble != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.');
+          try {
+            final double output = api.echoDouble(arg_aDouble!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final String? arg_aString = (args[0] as String?);
+          assert(arg_aString != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.');
+          try {
+            final String output = api.echoString(arg_aString!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final Uint8List? arg_list = (args[0] as Uint8List?);
+          assert(arg_list != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.');
+          try {
+            final Uint8List output = api.echoUint8List(arg_list!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final List<Object?>? arg_list =
+              (args[0] as List<Object?>?)?.cast<Object?>();
+          assert(arg_list != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List<Object?>.');
+          try {
+            final List<Object?> output = api.echoList(arg_list!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final List<AnEnum?>? arg_enumList =
+              (args[0] as List<Object?>?)?.cast<AnEnum?>();
+          assert(arg_enumList != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null, expected non-null List<AnEnum?>.');
+          try {
+            final List<AnEnum?> output = api.echoEnumList(arg_enumList!);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final List<AllNullableTypes?>? arg_classList =
+              (args[0] as List<Object?>?)?.cast<AllNullableTypes?>();
+          assert(arg_classList != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null, expected non-null List<AllNullableTypes?>.');
+          try {
+            final List<AllNullableTypes?> output =
+                api.echoClassList(arg_classList!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4598,7 +5537,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4606,13 +5545,14 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final double? arg_aDouble = (args[0] as double?);
-          assert(arg_aDouble != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.');
+          final List<AnEnum>? arg_enumList =
+              (args[0] as List<Object?>?)?.cast<AnEnum>();
+          assert(arg_enumList != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null, expected non-null List<AnEnum>.');
           try {
-            final double output = api.echoDouble(arg_aDouble!);
+            final List<AnEnum> output = api.echoNonNullEnumList(arg_enumList!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4627,7 +5567,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4635,13 +5575,15 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final String? arg_aString = (args[0] as String?);
-          assert(arg_aString != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.');
+          final List<AllNullableTypes>? arg_classList =
+              (args[0] as List<Object?>?)?.cast<AllNullableTypes>();
+          assert(arg_classList != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList was null, expected non-null List<AllNullableTypes>.');
           try {
-            final String output = api.echoString(arg_aString!);
+            final List<AllNullableTypes> output =
+                api.echoNonNullClassList(arg_classList!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4656,7 +5598,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4664,13 +5606,14 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Uint8List? arg_list = (args[0] as Uint8List?);
-          assert(arg_list != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.');
+          final Map<Object?, Object?>? arg_map =
+              (args[0] as Map<Object?, Object?>?)?.cast<Object?, Object?>();
+          assert(arg_map != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map<Object?, Object?>.');
           try {
-            final Uint8List output = api.echoUint8List(arg_list!);
+            final Map<Object?, Object?> output = api.echoMap(arg_map!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4685,7 +5628,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4693,14 +5636,15 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final List<Object?>? arg_list =
-              (args[0] as List<Object?>?)?.cast<Object?>();
-          assert(arg_list != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List<Object?>.');
+          final Map<String?, String?>? arg_stringMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<String?, String?>();
+          assert(arg_stringMap != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null, expected non-null Map<String?, String?>.');
           try {
-            final List<Object?> output = api.echoList(arg_list!);
+            final Map<String?, String?> output =
+                api.echoStringMap(arg_stringMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4715,7 +5659,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4723,14 +5667,14 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final List<AnEnum?>? arg_enumList =
-              (args[0] as List<Object?>?)?.cast<AnEnum?>();
-          assert(arg_enumList != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null, expected non-null List<AnEnum?>.');
+          final Map<int?, int?>? arg_intMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<int?, int?>();
+          assert(arg_intMap != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null, expected non-null Map<int?, int?>.');
           try {
-            final List<AnEnum?> output = api.echoEnumList(arg_enumList!);
+            final Map<int?, int?> output = api.echoIntMap(arg_intMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4745,7 +5689,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4753,15 +5697,14 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final List<AllNullableTypes?>? arg_classList =
-              (args[0] as List<Object?>?)?.cast<AllNullableTypes?>();
-          assert(arg_classList != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null, expected non-null List<AllNullableTypes?>.');
+          final Map<AnEnum?, AnEnum?>? arg_enumMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>();
+          assert(arg_enumMap != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null, expected non-null Map<AnEnum?, AnEnum?>.');
           try {
-            final List<AllNullableTypes?> output =
-                api.echoClassList(arg_classList!);
+            final Map<AnEnum?, AnEnum?> output = api.echoEnumMap(arg_enumMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4776,7 +5719,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4784,14 +5727,16 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Map<Object?, Object?>? arg_map =
-              (args[0] as Map<Object?, Object?>?)?.cast<Object?, Object?>();
-          assert(arg_map != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map<Object?, Object?>.');
+          final Map<int?, AllNullableTypes?>? arg_classMap =
+              (args[0] as Map<Object?, Object?>?)
+                  ?.cast<int?, AllNullableTypes?>();
+          assert(arg_classMap != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null, expected non-null Map<int?, AllNullableTypes?>.');
           try {
-            final Map<Object?, Object?> output = api.echoMap(arg_map!);
+            final Map<int?, AllNullableTypes?> output =
+                api.echoClassMap(arg_classMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4806,7 +5751,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4814,15 +5759,15 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Map<String?, String?>? arg_stringMap =
-              (args[0] as Map<Object?, Object?>?)?.cast<String?, String?>();
+          final Map<String, String>? arg_stringMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<String, String>();
           assert(arg_stringMap != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null, expected non-null Map<String?, String?>.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap was null, expected non-null Map<String, String>.');
           try {
-            final Map<String?, String?> output =
-                api.echoStringMap(arg_stringMap!);
+            final Map<String, String> output =
+                api.echoNonNullStringMap(arg_stringMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4837,7 +5782,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4845,14 +5790,14 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Map<int?, int?>? arg_intMap =
-              (args[0] as Map<Object?, Object?>?)?.cast<int?, int?>();
+          final Map<int, int>? arg_intMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<int, int>();
           assert(arg_intMap != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null, expected non-null Map<int?, int?>.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null, expected non-null Map<int, int>.');
           try {
-            final Map<int?, int?> output = api.echoIntMap(arg_intMap!);
+            final Map<int, int> output = api.echoNonNullIntMap(arg_intMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4867,7 +5812,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4875,14 +5820,15 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Map<AnEnum?, AnEnum?>? arg_enumMap =
-              (args[0] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>();
+          final Map<AnEnum, AnEnum>? arg_enumMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<AnEnum, AnEnum>();
           assert(arg_enumMap != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null, expected non-null Map<AnEnum?, AnEnum?>.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap was null, expected non-null Map<AnEnum, AnEnum>.');
           try {
-            final Map<AnEnum?, AnEnum?> output = api.echoEnumMap(arg_enumMap!);
+            final Map<AnEnum, AnEnum> output =
+                api.echoNonNullEnumMap(arg_enumMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -4897,7 +5843,7 @@ abstract class FlutterIntegrationCoreApi {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
               Object?>(
-          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap$messageChannelSuffix',
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap$messageChannelSuffix',
           pigeonChannelCodec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
@@ -4905,16 +5851,16 @@ abstract class FlutterIntegrationCoreApi {
       } else {
         pigeonVar_channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final Map<int?, AllNullableTypes?>? arg_classMap =
+          final Map<int, AllNullableTypes>? arg_classMap =
               (args[0] as Map<Object?, Object?>?)
-                  ?.cast<int?, AllNullableTypes?>();
+                  ?.cast<int, AllNullableTypes>();
           assert(arg_classMap != null,
-              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null, expected non-null Map<int?, AllNullableTypes?>.');
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap was null, expected non-null Map<int, AllNullableTypes>.');
           try {
-            final Map<int?, AllNullableTypes?> output =
-                api.echoClassMap(arg_classMap!);
+            final Map<int, AllNullableTypes> output =
+                api.echoNonNullClassMap(arg_classMap!);
             return wrapResponse(result: output);
           } on PlatformException catch (e) {
             return wrapResponse(error: e);
@@ -5204,6 +6150,64 @@ abstract class FlutterIntegrationCoreApi {
         });
       }
     }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final List<AnEnum>? arg_enumList =
+              (args[0] as List<Object?>?)?.cast<AnEnum>();
+          try {
+            final List<AnEnum>? output =
+                api.echoNullableNonNullEnumList(arg_enumList);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final List<AllNullableTypes>? arg_classList =
+              (args[0] as List<Object?>?)?.cast<AllNullableTypes>();
+          try {
+            final List<AllNullableTypes>? output =
+                api.echoNullableNonNullClassList(arg_classList);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
     {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
@@ -5348,6 +6352,123 @@ abstract class FlutterIntegrationCoreApi {
         });
       }
     }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final Map<String, String>? arg_stringMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<String, String>();
+          try {
+            final Map<String, String>? output =
+                api.echoNullableNonNullStringMap(arg_stringMap);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final Map<int, int>? arg_intMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<int, int>();
+          try {
+            final Map<int, int>? output =
+                api.echoNullableNonNullIntMap(arg_intMap);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final Map<AnEnum, AnEnum>? arg_enumMap =
+              (args[0] as Map<Object?, Object?>?)?.cast<AnEnum, AnEnum>();
+          try {
+            final Map<AnEnum, AnEnum>? output =
+                api.echoNullableNonNullEnumMap(arg_enumMap);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
+    {
+      final BasicMessageChannel<
+          Object?> pigeonVar_channel = BasicMessageChannel<
+              Object?>(
+          'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap$messageChannelSuffix',
+          pigeonChannelCodec,
+          binaryMessenger: binaryMessenger);
+      if (api == null) {
+        pigeonVar_channel.setMessageHandler(null);
+      } else {
+        pigeonVar_channel.setMessageHandler((Object? message) async {
+          assert(message != null,
+              'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap was null.');
+          final List<Object?> args = (message as List<Object?>?)!;
+          final Map<int, AllNullableTypes>? arg_classMap =
+              (args[0] as Map<Object?, Object?>?)
+                  ?.cast<int, AllNullableTypes>();
+          try {
+            final Map<int, AllNullableTypes>? output =
+                api.echoNullableNonNullClassMap(arg_classMap);
+            return wrapResponse(result: output);
+          } on PlatformException catch (e) {
+            return wrapResponse(error: e);
+          } catch (e) {
+            return wrapResponse(
+                error: PlatformException(code: 'error', message: e.toString()));
+          }
+        });
+      }
+    }
     {
       final BasicMessageChannel<
           Object?> pigeonVar_channel = BasicMessageChannel<
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart
index eb40693a844..54d95c4149b 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart
@@ -2807,8 +2807,8 @@ class ProxyApiTestClass extends ProxyApiSuperClass
 
   /// Returns the passed list with ProxyApis, to test serialization and
   /// deserialization.
-  Future<List<ProxyApiTestClass?>> echoProxyApiList(
-      List<ProxyApiTestClass?> aList) async {
+  Future<List<ProxyApiTestClass>> echoProxyApiList(
+      List<ProxyApiTestClass> aList) async {
     final _PigeonInternalProxyApiBaseCodec pigeonChannelCodec =
         _pigeonVar_codecProxyApiTestClass;
     final BinaryMessenger? pigeonVar_binaryMessenger = pigeon_binaryMessenger;
@@ -2837,7 +2837,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass
       );
     } else {
       return (pigeonVar_replyList[0] as List<Object?>?)!
-          .cast<ProxyApiTestClass?>();
+          .cast<ProxyApiTestClass>();
     }
   }
 
@@ -2877,8 +2877,8 @@ class ProxyApiTestClass extends ProxyApiSuperClass
 
   /// Returns the passed map with ProxyApis, to test serialization and
   /// deserialization.
-  Future<Map<String?, ProxyApiTestClass?>> echoProxyApiMap(
-      Map<String?, ProxyApiTestClass?> aMap) async {
+  Future<Map<String, ProxyApiTestClass>> echoProxyApiMap(
+      Map<String, ProxyApiTestClass> aMap) async {
     final _PigeonInternalProxyApiBaseCodec pigeonChannelCodec =
         _pigeonVar_codecProxyApiTestClass;
     final BinaryMessenger? pigeonVar_binaryMessenger = pigeon_binaryMessenger;
@@ -2907,7 +2907,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass
       );
     } else {
       return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!
-          .cast<String?, ProxyApiTestClass?>();
+          .cast<String, ProxyApiTestClass>();
     }
   }
 
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
index bec4db449c9..613f80c2490 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// ignore_for_file: unused_local_variable, public_member_api_docs
+// ignore_for_file: public_member_api_docs
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -54,20 +54,37 @@ void compareAllNullableTypesWithoutRecursion(
       true);
   expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
       true);
+  // expect(
+  //     listEquals(
+  //         allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
+  //     true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
   //for (int i = 0; i < allNullableTypesOne.listList!.length; i++) {
   //  expect(listEquals(allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
   //      true);
   //}
+  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
+  //     true);
   expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
   expect(
       mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
       true);
   expect(
       mapEquals(allNullableTypesOne.intMap, allNullableTypesTwo.intMap), true);
-  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-      true);
+  // expect(
+  //     mapEquals(allNullableTypesOne.doubleMap, allNullableTypesTwo.doubleMap),
+  //     true);
+  // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
+  //     true);
+  // expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
+  //     true);
+  // expect(
+  //     mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
+  // true);
+  // listMap: check each key and value, and compare each lists values
+  //
+  // mapMap: check each key and value, and compare each map in the same way
 }
 
 void compareAllTypes(AllTypes? allTypesOne, AllTypes? allTypesTwo) {
@@ -92,16 +109,24 @@ void compareAllTypes(AllTypes? allTypesOne, AllTypes? allTypesTwo) {
   expect(listEquals(allTypesOne.doubleList, allTypesTwo.doubleList), true);
   expect(listEquals(allTypesOne.boolList, allTypesTwo.boolList), true);
   expect(listEquals(allTypesOne.enumList, allTypesTwo.enumList), true);
+  // expect(listEquals(allTypesOne.objectList, allTypesTwo.objectList), true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
   //for (int i = 0; i < allTypesOne.listList!.length; i++) {
   //  expect(listEquals(allTypesOne.listList![i], allTypesTwo.listList![i]),
   //      true);
   //}
+  // expect(listEquals(allTypesOne.mapList, allTypesTwo.mapList), true);
   expect(mapEquals(allTypesOne.map, allTypesTwo.map), true);
   expect(mapEquals(allTypesOne.stringMap, allTypesTwo.stringMap), true);
   expect(mapEquals(allTypesOne.intMap, allTypesTwo.intMap), true);
+  // expect(mapEquals(allTypesOne.doubleMap, allTypesTwo.doubleMap), true);
+  // expect(mapEquals(allTypesOne.boolMap, allTypesTwo.boolMap), true);
   expect(mapEquals(allTypesOne.enumMap, allTypesTwo.enumMap), true);
+  // expect(mapEquals(allTypesOne.objectMap, allTypesTwo.objectMap), true);
+  // listMap: check each key and value, and compare each lists values
+  //
+  // mapMap: check each key and value, and compare each map in the same way
 }
 
 void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
@@ -146,26 +171,51 @@ void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
       true);
   expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
       true);
+  // expect(
+  //     listEquals(
+  //         allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
+  // true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
   //for (int i = 0; i < allNullableTypesOne.listList!.length; i++) {
   //  expect(listEquals(allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
   //      true);
   //}
+  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
+  //     true);
+  // for (int i = 0; i < (allNullableTypesOne.classList?.length ?? 0); i++) {
+  //   compareAllNullableTypesWithoutRecursion(
+  //       allNullableTypesOne.classList?[i], allNullableTypesTwo.classList?[i]);
+  // }
   for (int i = 0;
       i < (allNullableTypesOne.recursiveClassList?.length ?? 0);
       i++) {
     compareAllNullableTypes(allNullableTypesOne.recursiveClassList?[i],
         allNullableTypesTwo.recursiveClassList?[i]);
   }
+  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
+  //     true);
   expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
   expect(
       mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
       true);
   expect(
       mapEquals(allNullableTypesOne.intMap, allNullableTypesTwo.intMap), true);
-  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-      true);
+  // expect(
+  //     mapEquals(allNullableTypesOne.doubleMap, allNullableTypesTwo.doubleMap),
+  //     true);
+  // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
+  //     true);
+  // expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
+  //     true);
+  // expect(
+  //     mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
+  //     true);
+  // listMap: check each key and value, and compare each lists values
+  //
+  // mapMap: check each key and value, and compare each map in the same way
+  //
+  // recursiveClassMap: check each key and value, call each compare method for every class
 }
 
 void compareAllClassesWrapper(
@@ -183,40 +233,141 @@ void compareAllClassesWrapper(
   );
   compareAllTypes(wrapperOne.allTypes, wrapperTwo.allTypes);
 
-  for (int i = 0; i < (wrapperOne.classList.length); i++) {
-    compareAllTypes(wrapperOne.classList[i], wrapperTwo.classList[i]);
-  }
-  if (wrapperOne.nullableClassList != null &&
-      wrapperTwo.nullableClassList != null) {
-    for (int i = 0; i < (wrapperOne.nullableClassList!.length); i++) {
-      compareAllNullableTypesWithoutRecursion(
-          wrapperOne.nullableClassList![i], wrapperTwo.nullableClassList![i]);
-    }
-  } else {
-    expect(wrapperOne.nullableClassList != null,
-        wrapperTwo.nullableClassList != null);
-  }
-  final Iterable<int?> wrapperOneKeys = wrapperOne.classMap.keys;
-  final Iterable<int?> wrapperTwoKeys = wrapperTwo.classMap.keys;
-  expect(wrapperOneKeys.length, wrapperTwoKeys.length);
-  for (final int? key in wrapperOneKeys) {
-    compareAllTypes(wrapperOne.classMap[key], wrapperTwo.classMap[key]);
-  }
-  if (wrapperOne.nullableClassMap != null &&
-      wrapperTwo.nullableClassMap != null) {
-    final Iterable<int?> wrapperOneKeys = wrapperOne.nullableClassMap!.keys;
-    final Iterable<int?> wrapperTwoKeys = wrapperTwo.nullableClassMap!.keys;
-    expect(wrapperOneKeys.length, wrapperTwoKeys.length);
-    for (final int? key in wrapperOneKeys) {
-      compareAllNullableTypesWithoutRecursion(
-          wrapperOne.nullableClassMap![key], wrapperTwo.nullableClassMap![key]);
-    }
-  } else {
-    expect(wrapperOne.nullableClassMap != null,
-        wrapperTwo.nullableClassMap != null);
-  }
+  // for (int i = 0; i < (allTypesOne.classList.length); i++) {
+  //   compareAllTypes(
+  //       allTypesOne.classList[i], allTypesTwo.classList[i]);
+  // }
+  //
+  // classMap: check each key and value, call each compare method for every class
+  //
+  // for (int i = 0; i < (allTypesOne.nullableClassList.length); i++) {
+  //   compareAllNullableTypesWithoutRecursion(
+  //       allTypesOne.nullableClassList[i], allTypesTwo.nullableClassList[i]);
+  // }
+  //
+  // ClassMap: check each key and value, call each compare method for every class
 }
 
+final List<Object> nonNullList = <Object>[
+  'Thing 1',
+  2,
+  true,
+  3.14,
+];
+
+final List<String> nonNullStringList = <String>[
+  'Thing 1',
+  '2',
+  'true',
+  '3.14',
+];
+
+final List<int> nonNullIntList = <int>[
+  1,
+  2,
+  3,
+  4,
+];
+
+final List<double> nonNullDoubleList = <double>[
+  1,
+  2.99999,
+  3,
+  3.14,
+];
+
+final List<bool> nonNullBoolList = <bool>[
+  true,
+  false,
+  true,
+  false,
+];
+
+final List<AnEnum> nonNullEnumList = <AnEnum>[
+  AnEnum.one,
+  AnEnum.two,
+  AnEnum.three,
+  AnEnum.fortyTwo,
+  AnEnum.fourHundredTwentyTwo,
+];
+
+final List<List<Object>> nonNullListList = <List<Object>>[
+  nonNullList,
+  nonNullStringList,
+  nonNullIntList,
+  nonNullDoubleList,
+  nonNullBoolList,
+  nonNullEnumList,
+];
+
+final Map<Object, Object> nonNullMap = <Object, Object>{
+  'a': 1,
+  'b': 2.0,
+  'c': 'three',
+  'd': false,
+};
+
+final Map<String, String> nonNullStringMap = <String, String>{
+  'a': '1',
+  'b': '2.0',
+  'c': 'three',
+  'd': 'false',
+};
+
+final Map<int, int> nonNullIntMap = <int, int>{
+  0: 0,
+  1: 1,
+  2: 3,
+  4: -1,
+};
+
+final Map<double, double> nonNullDoubleMap = <double, double>{
+  0.0: 0,
+  1.1: 2.0,
+  3: 0.3,
+  -.4: -0.2,
+};
+
+final Map<int, bool> nonNullBoolMap = <int, bool>{
+  0: true,
+  1: false,
+  2: true,
+};
+
+final Map<AnEnum, AnEnum> nonNullEnumMap = <AnEnum, AnEnum>{
+  AnEnum.one: AnEnum.one,
+  AnEnum.two: AnEnum.two,
+  AnEnum.three: AnEnum.three,
+  AnEnum.fortyTwo: AnEnum.fortyTwo,
+};
+
+final Map<int, List<Object>> nonNullListMap = <int, List<Object>>{
+  0: nonNullList,
+  1: nonNullStringList,
+  2: nonNullDoubleList,
+  4: nonNullIntList,
+  5: nonNullBoolList,
+  6: nonNullEnumList,
+};
+
+final Map<int, Map<Object, Object>> nonNullMapMap = <int, Map<Object, Object>>{
+  0: nonNullMap,
+  1: nonNullStringMap,
+  2: nonNullDoubleMap,
+  4: nonNullIntMap,
+  5: nonNullBoolMap,
+  6: nonNullEnumMap,
+};
+
+final List<Map<Object, Object>> nonNullMapList = <Map<Object, Object>>[
+  nonNullMap,
+  nonNullStringMap,
+  nonNullDoubleMap,
+  nonNullIntMap,
+  nonNullBoolMap,
+  nonNullEnumMap,
+];
+
 final List<Object?> list = <Object?>[
   'Thing 1',
   2,
@@ -352,7 +503,7 @@ final List<Map<Object?, Object?>?> mapList = <Map<Object?, Object?>?>[
   boolMap,
   enumMap,
   null
-]; // fill in.
+];
 
 final AllNullableTypesWithoutRecursion genericAllNullableTypesWithoutRecursion =
     AllNullableTypesWithoutRecursion(
@@ -373,8 +524,8 @@ final AllNullableTypesWithoutRecursion genericAllNullableTypesWithoutRecursion =
   doubleList: doubleList,
   boolList: boolList,
   enumList: enumList,
-  // objectList: list,
-  // listList: listList,
+  objectList: list,
+  listList: listList,
   // mapList: mapList,
   map: map,
   stringMap: stringMap,
@@ -382,7 +533,7 @@ final AllNullableTypesWithoutRecursion genericAllNullableTypesWithoutRecursion =
   // doubleMap: doubleMap,
   // boolMap: boolMap,
   enumMap: enumMap,
-  // objectMap: map,
+  objectMap: map,
   // listMap: listMap,
   // mapMap: mapMap,
 );
@@ -416,24 +567,23 @@ final AllTypes genericAllTypes = AllTypes(
   anEnum: AnEnum.fortyTwo,
   anObject: 1,
   list: list,
-  stringList: stringList,
-  intList: intList,
-  doubleList: doubleList,
-  boolList: boolList,
-  // aClass: genericAllNullableTypesWithoutRecursion,
-  enumList: enumList,
-  // objectList: list,
-  listList: listList,
-  // mapList: mapList,
-  map: map,
-  stringMap: stringMap,
-  intMap: intMap,
-  // doubleMap: doubleMap,
-  // boolMap: boolMap,
-  enumMap: enumMap,
-  // objectMap: map,
-  // listMap: listMap,
-  // mapMap: mapMap,
+  stringList: nonNullStringList,
+  intList: nonNullIntList,
+  doubleList: nonNullDoubleList,
+  boolList: nonNullBoolList,
+  enumList: nonNullEnumList,
+  objectList: nonNullList,
+  listList: nonNullListList,
+  // mapList: nonNullMapList,
+  map: nonNullMap,
+  stringMap: nonNullStringMap,
+  intMap: nonNullIntMap,
+  // doubleMap: nonNullDoubleMap,
+  // boolMap: nonNullBoolMap,
+  enumMap: nonNullEnumMap,
+  objectMap: nonNullMap,
+  // listMap: nonNullListMap,
+  // mapMap: nonNullMapMap,
 );
 
 final List<AllTypes?> allTypesClassList = <AllTypes?>[
@@ -464,20 +614,31 @@ final AllNullableTypes genericAllNullableTypes = AllNullableTypes(
   doubleList: doubleList,
   boolList: boolList,
   enumList: enumList,
-  // objectList: list,
-  // listList: listList,
+  objectList: list,
+  listList: listList,
   // mapList: mapList,
   map: map,
-  // stringMap: stringMap,
+  stringMap: stringMap,
   intMap: intMap,
   // doubleMap: doubleMap,
   // boolMap: boolMap,
   enumMap: enumMap,
-  // objectMap: map,
+  objectMap: map,
   // listMap: listMap,
   // mapMap: mapMap,
 );
 
+final List<AllNullableTypes> nonNullAllNullableTypesList = <AllNullableTypes>[
+  genericAllNullableTypes,
+  AllNullableTypes(),
+];
+
+final Map<int, AllNullableTypes> nonNullAllNullableTypesMap =
+    <int, AllNullableTypes>{
+  0: genericAllNullableTypes,
+  1: AllNullableTypes(),
+};
+
 final List<AllNullableTypes?> allNullableTypesList = <AllNullableTypes?>[
   genericAllNullableTypes,
   AllNullableTypes(),
@@ -510,7 +671,7 @@ final AllNullableTypes recursiveAllNullableTypes = AllNullableTypes(
   doubleList: doubleList,
   boolList: boolList,
   enumList: enumList,
-  // objectList: list,
+  objectList: list,
   listList: listList,
   // mapList: mapList,
   recursiveClassList: allNullableTypesList,
@@ -520,7 +681,7 @@ final AllNullableTypes recursiveAllNullableTypes = AllNullableTypes(
   // doubleMap: doubleMap,
   // boolMap: boolMap,
   enumMap: enumMap,
-  // objectMap: map,
+  objectMap: map,
   // listMap: listMap,
   // mapMap: mapMap,
   recursiveClassMap: allNullableTypesMap,
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
index 2780bc68199..eac9d2452a6 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
+++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
@@ -95,16 +95,18 @@ data class AllTypes(
     val aString: String,
     val anObject: Any,
     val list: List<Any?>,
-    val stringList: List<String?>,
-    val intList: List<Long?>,
-    val doubleList: List<Double?>,
-    val boolList: List<Boolean?>,
-    val enumList: List<AnEnum?>,
-    val listList: List<List<Any?>?>,
+    val stringList: List<String>,
+    val intList: List<Long>,
+    val doubleList: List<Double>,
+    val boolList: List<Boolean>,
+    val enumList: List<AnEnum>,
+    val objectList: List<Any>,
+    val listList: List<List<Any?>>,
     val map: Map<Any, Any?>,
-    val stringMap: Map<String?, String?>,
-    val intMap: Map<Long?, Long?>,
-    val enumMap: Map<AnEnum?, AnEnum?>
+    val stringMap: Map<String, String>,
+    val intMap: Map<Long, Long>,
+    val enumMap: Map<AnEnum, AnEnum>,
+    val objectMap: Map<Any, Any>
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): AllTypes {
@@ -121,16 +123,18 @@ data class AllTypes(
       val aString = pigeonVar_list[10] as String
       val anObject = pigeonVar_list[11] as Any
       val list = pigeonVar_list[12] as List<Any?>
-      val stringList = pigeonVar_list[13] as List<String?>
-      val intList = pigeonVar_list[14] as List<Long?>
-      val doubleList = pigeonVar_list[15] as List<Double?>
-      val boolList = pigeonVar_list[16] as List<Boolean?>
-      val enumList = pigeonVar_list[17] as List<AnEnum?>
-      val listList = pigeonVar_list[18] as List<List<Any?>?>
-      val map = pigeonVar_list[19] as Map<Any, Any?>
-      val stringMap = pigeonVar_list[20] as Map<String?, String?>
-      val intMap = pigeonVar_list[21] as Map<Long?, Long?>
-      val enumMap = pigeonVar_list[22] as Map<AnEnum?, AnEnum?>
+      val stringList = pigeonVar_list[13] as List<String>
+      val intList = pigeonVar_list[14] as List<Long>
+      val doubleList = pigeonVar_list[15] as List<Double>
+      val boolList = pigeonVar_list[16] as List<Boolean>
+      val enumList = pigeonVar_list[17] as List<AnEnum>
+      val objectList = pigeonVar_list[18] as List<Any>
+      val listList = pigeonVar_list[19] as List<List<Any?>>
+      val map = pigeonVar_list[20] as Map<Any, Any?>
+      val stringMap = pigeonVar_list[21] as Map<String, String>
+      val intMap = pigeonVar_list[22] as Map<Long, Long>
+      val enumMap = pigeonVar_list[23] as Map<AnEnum, AnEnum>
+      val objectMap = pigeonVar_list[24] as Map<Any, Any>
       return AllTypes(
           aBool,
           anInt,
@@ -150,11 +154,13 @@ data class AllTypes(
           doubleList,
           boolList,
           enumList,
+          objectList,
           listList,
           map,
           stringMap,
           intMap,
-          enumMap)
+          enumMap,
+          objectMap)
     }
   }
 
@@ -178,11 +184,13 @@ data class AllTypes(
         doubleList,
         boolList,
         enumList,
+        objectList,
         listList,
         map,
         stringMap,
         intMap,
         enumMap,
+        objectMap,
     )
   }
 }
@@ -212,12 +220,14 @@ data class AllNullableTypes(
     val doubleList: List<Double?>? = null,
     val boolList: List<Boolean?>? = null,
     val enumList: List<AnEnum?>? = null,
+    val objectList: List<Any?>? = null,
     val listList: List<List<Any?>?>? = null,
     val recursiveClassList: List<AllNullableTypes?>? = null,
     val map: Map<Any, Any?>? = null,
     val stringMap: Map<String?, String?>? = null,
     val intMap: Map<Long?, Long?>? = null,
     val enumMap: Map<AnEnum?, AnEnum?>? = null,
+    val objectMap: Map<Any?, Any?>? = null,
     val recursiveClassMap: Map<Long?, AllNullableTypes?>? = null
 ) {
   companion object {
@@ -241,13 +251,15 @@ data class AllNullableTypes(
       val doubleList = pigeonVar_list[16] as List<Double?>?
       val boolList = pigeonVar_list[17] as List<Boolean?>?
       val enumList = pigeonVar_list[18] as List<AnEnum?>?
-      val listList = pigeonVar_list[19] as List<List<Any?>?>?
-      val recursiveClassList = pigeonVar_list[20] as List<AllNullableTypes?>?
-      val map = pigeonVar_list[21] as Map<Any, Any?>?
-      val stringMap = pigeonVar_list[22] as Map<String?, String?>?
-      val intMap = pigeonVar_list[23] as Map<Long?, Long?>?
-      val enumMap = pigeonVar_list[24] as Map<AnEnum?, AnEnum?>?
-      val recursiveClassMap = pigeonVar_list[25] as Map<Long?, AllNullableTypes?>?
+      val objectList = pigeonVar_list[19] as List<Any?>?
+      val listList = pigeonVar_list[20] as List<List<Any?>?>?
+      val recursiveClassList = pigeonVar_list[21] as List<AllNullableTypes?>?
+      val map = pigeonVar_list[22] as Map<Any, Any?>?
+      val stringMap = pigeonVar_list[23] as Map<String?, String?>?
+      val intMap = pigeonVar_list[24] as Map<Long?, Long?>?
+      val enumMap = pigeonVar_list[25] as Map<AnEnum?, AnEnum?>?
+      val objectMap = pigeonVar_list[26] as Map<Any?, Any?>?
+      val recursiveClassMap = pigeonVar_list[27] as Map<Long?, AllNullableTypes?>?
       return AllNullableTypes(
           aNullableBool,
           aNullableInt,
@@ -268,12 +280,14 @@ data class AllNullableTypes(
           doubleList,
           boolList,
           enumList,
+          objectList,
           listList,
           recursiveClassList,
           map,
           stringMap,
           intMap,
           enumMap,
+          objectMap,
           recursiveClassMap)
     }
   }
@@ -299,12 +313,14 @@ data class AllNullableTypes(
         doubleList,
         boolList,
         enumList,
+        objectList,
         listList,
         recursiveClassList,
         map,
         stringMap,
         intMap,
         enumMap,
+        objectMap,
         recursiveClassMap,
     )
   }
@@ -335,11 +351,13 @@ data class AllNullableTypesWithoutRecursion(
     val doubleList: List<Double?>? = null,
     val boolList: List<Boolean?>? = null,
     val enumList: List<AnEnum?>? = null,
+    val objectList: List<Any?>? = null,
     val listList: List<List<Any?>?>? = null,
     val map: Map<Any, Any?>? = null,
     val stringMap: Map<String?, String?>? = null,
     val intMap: Map<Long?, Long?>? = null,
-    val enumMap: Map<AnEnum?, AnEnum?>? = null
+    val enumMap: Map<AnEnum?, AnEnum?>? = null,
+    val objectMap: Map<Any?, Any?>? = null
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): AllNullableTypesWithoutRecursion {
@@ -361,11 +379,13 @@ data class AllNullableTypesWithoutRecursion(
       val doubleList = pigeonVar_list[15] as List<Double?>?
       val boolList = pigeonVar_list[16] as List<Boolean?>?
       val enumList = pigeonVar_list[17] as List<AnEnum?>?
-      val listList = pigeonVar_list[18] as List<List<Any?>?>?
-      val map = pigeonVar_list[19] as Map<Any, Any?>?
-      val stringMap = pigeonVar_list[20] as Map<String?, String?>?
-      val intMap = pigeonVar_list[21] as Map<Long?, Long?>?
-      val enumMap = pigeonVar_list[22] as Map<AnEnum?, AnEnum?>?
+      val objectList = pigeonVar_list[18] as List<Any?>?
+      val listList = pigeonVar_list[19] as List<List<Any?>?>?
+      val map = pigeonVar_list[20] as Map<Any, Any?>?
+      val stringMap = pigeonVar_list[21] as Map<String?, String?>?
+      val intMap = pigeonVar_list[22] as Map<Long?, Long?>?
+      val enumMap = pigeonVar_list[23] as Map<AnEnum?, AnEnum?>?
+      val objectMap = pigeonVar_list[24] as Map<Any?, Any?>?
       return AllNullableTypesWithoutRecursion(
           aNullableBool,
           aNullableInt,
@@ -385,11 +405,13 @@ data class AllNullableTypesWithoutRecursion(
           doubleList,
           boolList,
           enumList,
+          objectList,
           listList,
           map,
           stringMap,
           intMap,
-          enumMap)
+          enumMap,
+          objectMap)
     }
   }
 
@@ -413,11 +435,13 @@ data class AllNullableTypesWithoutRecursion(
         doubleList,
         boolList,
         enumList,
+        objectList,
         listList,
         map,
         stringMap,
         intMap,
         enumMap,
+        objectMap,
     )
   }
 }
@@ -600,6 +624,10 @@ interface HostIntegrationCoreApi {
   fun echoEnumList(enumList: List<AnEnum?>): List<AnEnum?>
   /** Returns the passed list, to test serialization and deserialization. */
   fun echoClassList(classList: List<AllNullableTypes?>): List<AllNullableTypes?>
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNonNullEnumList(enumList: List<AnEnum>): List<AnEnum>
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNonNullClassList(classList: List<AllNullableTypes>): List<AllNullableTypes>
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoMap(map: Map<Any?, Any?>): Map<Any?, Any?>
   /** Returns the passed map, to test serialization and deserialization. */
@@ -610,6 +638,14 @@ interface HostIntegrationCoreApi {
   fun echoEnumMap(enumMap: Map<AnEnum?, AnEnum?>): Map<AnEnum?, AnEnum?>
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoClassMap(classMap: Map<Long?, AllNullableTypes?>): Map<Long?, AllNullableTypes?>
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullStringMap(stringMap: Map<String, String>): Map<String, String>
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullIntMap(intMap: Map<Long, Long>): Map<Long, Long>
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullEnumMap(enumMap: Map<AnEnum, AnEnum>): Map<AnEnum, AnEnum>
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullClassMap(classMap: Map<Long, AllNullableTypes>): Map<Long, AllNullableTypes>
   /** Returns the passed class to test nested class serialization and deserialization. */
   fun echoClassWrapper(wrapper: AllClassesWrapper): AllClassesWrapper
   /** Returns the passed enum to test serialization and deserialization. */
@@ -666,6 +702,10 @@ interface HostIntegrationCoreApi {
   fun echoNullableEnumList(enumList: List<AnEnum?>?): List<AnEnum?>?
   /** Returns the passed list, to test serialization and deserialization. */
   fun echoNullableClassList(classList: List<AllNullableTypes?>?): List<AllNullableTypes?>?
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNullableNonNullEnumList(enumList: List<AnEnum>?): List<AnEnum>?
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNullableNonNullClassList(classList: List<AllNullableTypes>?): List<AllNullableTypes>?
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoNullableMap(map: Map<Any?, Any?>?): Map<Any?, Any?>?
   /** Returns the passed map, to test serialization and deserialization. */
@@ -676,6 +716,16 @@ interface HostIntegrationCoreApi {
   fun echoNullableEnumMap(enumMap: Map<AnEnum?, AnEnum?>?): Map<AnEnum?, AnEnum?>?
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoNullableClassMap(classMap: Map<Long?, AllNullableTypes?>?): Map<Long?, AllNullableTypes?>?
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullStringMap(stringMap: Map<String, String>?): Map<String, String>?
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullIntMap(intMap: Map<Long, Long>?): Map<Long, Long>?
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullEnumMap(enumMap: Map<AnEnum, AnEnum>?): Map<AnEnum, AnEnum>?
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>?
+  ): Map<Long, AllNullableTypes>?
 
   fun echoNullableEnum(anEnum: AnEnum?): AnEnum?
 
@@ -856,6 +906,16 @@ interface HostIntegrationCoreApi {
       callback: (Result<List<AllNullableTypes?>>) -> Unit
   )
 
+  fun callFlutterEchoNonNullEnumList(
+      enumList: List<AnEnum>,
+      callback: (Result<List<AnEnum>>) -> Unit
+  )
+
+  fun callFlutterEchoNonNullClassList(
+      classList: List<AllNullableTypes>,
+      callback: (Result<List<AllNullableTypes>>) -> Unit
+  )
+
   fun callFlutterEchoMap(map: Map<Any?, Any?>, callback: (Result<Map<Any?, Any?>>) -> Unit)
 
   fun callFlutterEchoStringMap(
@@ -878,6 +938,26 @@ interface HostIntegrationCoreApi {
       callback: (Result<Map<Long?, AllNullableTypes?>>) -> Unit
   )
 
+  fun callFlutterEchoNonNullStringMap(
+      stringMap: Map<String, String>,
+      callback: (Result<Map<String, String>>) -> Unit
+  )
+
+  fun callFlutterEchoNonNullIntMap(
+      intMap: Map<Long, Long>,
+      callback: (Result<Map<Long, Long>>) -> Unit
+  )
+
+  fun callFlutterEchoNonNullEnumMap(
+      enumMap: Map<AnEnum, AnEnum>,
+      callback: (Result<Map<AnEnum, AnEnum>>) -> Unit
+  )
+
+  fun callFlutterEchoNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>,
+      callback: (Result<Map<Long, AllNullableTypes>>) -> Unit
+  )
+
   fun callFlutterEchoEnum(anEnum: AnEnum, callback: (Result<AnEnum>) -> Unit)
 
   fun callFlutterEchoAnotherEnum(anotherEnum: AnotherEnum, callback: (Result<AnotherEnum>) -> Unit)
@@ -904,6 +984,16 @@ interface HostIntegrationCoreApi {
       callback: (Result<List<AllNullableTypes?>?>) -> Unit
   )
 
+  fun callFlutterEchoNullableNonNullEnumList(
+      enumList: List<AnEnum>?,
+      callback: (Result<List<AnEnum>?>) -> Unit
+  )
+
+  fun callFlutterEchoNullableNonNullClassList(
+      classList: List<AllNullableTypes>?,
+      callback: (Result<List<AllNullableTypes>?>) -> Unit
+  )
+
   fun callFlutterEchoNullableMap(
       map: Map<Any?, Any?>?,
       callback: (Result<Map<Any?, Any?>?>) -> Unit
@@ -929,6 +1019,26 @@ interface HostIntegrationCoreApi {
       callback: (Result<Map<Long?, AllNullableTypes?>?>) -> Unit
   )
 
+  fun callFlutterEchoNullableNonNullStringMap(
+      stringMap: Map<String, String>?,
+      callback: (Result<Map<String, String>?>) -> Unit
+  )
+
+  fun callFlutterEchoNullableNonNullIntMap(
+      intMap: Map<Long, Long>?,
+      callback: (Result<Map<Long, Long>?>) -> Unit
+  )
+
+  fun callFlutterEchoNullableNonNullEnumMap(
+      enumMap: Map<AnEnum, AnEnum>?,
+      callback: (Result<Map<AnEnum, AnEnum>?>) -> Unit
+  )
+
+  fun callFlutterEchoNullableNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>?,
+      callback: (Result<Map<Long, AllNullableTypes>?>) -> Unit
+  )
+
   fun callFlutterEchoNullableEnum(anEnum: AnEnum?, callback: (Result<AnEnum?>) -> Unit)
 
   fun callFlutterEchoAnotherNullableEnum(
@@ -1255,6 +1365,50 @@ interface HostIntegrationCoreApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumListArg = args[0] as List<AnEnum>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullEnumList(enumListArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classListArg = args[0] as List<AllNullableTypes>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullClassList(classListArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel =
             BasicMessageChannel<Any?>(
@@ -1365,6 +1519,94 @@ interface HostIntegrationCoreApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullStringMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val stringMapArg = args[0] as Map<String, String>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullStringMap(stringMapArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullIntMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val intMapArg = args[0] as Map<Long, Long>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullIntMap(intMapArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumMapArg = args[0] as Map<AnEnum, AnEnum>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullEnumMap(enumMapArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classMapArg = args[0] as Map<Long, AllNullableTypes>
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNonNullClassMap(classMapArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel =
             BasicMessageChannel<Any?>(
@@ -1835,6 +2077,50 @@ interface HostIntegrationCoreApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumListArg = args[0] as List<AnEnum>?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNullableNonNullEnumList(enumListArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classListArg = args[0] as List<AllNullableTypes>?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNullableNonNullClassList(classListArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel =
             BasicMessageChannel<Any?>(
@@ -1949,15 +2235,15 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullStringMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anEnumArg = args[0] as AnEnum?
+            val stringMapArg = args[0] as Map<String, String>?
             val wrapped: List<Any?> =
                 try {
-                  listOf(api.echoNullableEnum(anEnumArg))
+                  listOf(api.echoNullableNonNullStringMap(stringMapArg))
                 } catch (exception: Throwable) {
                   wrapError(exception)
                 }
@@ -1971,15 +2257,15 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullIntMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anotherEnumArg = args[0] as AnotherEnum?
+            val intMapArg = args[0] as Map<Long, Long>?
             val wrapped: List<Any?> =
                 try {
-                  listOf(api.echoAnotherNullableEnum(anotherEnumArg))
+                  listOf(api.echoNullableNonNullIntMap(intMapArg))
                 } catch (exception: Throwable) {
                   wrapError(exception)
                 }
@@ -1993,15 +2279,15 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableIntArg = args[0] as Long?
+            val enumMapArg = args[0] as Map<AnEnum, AnEnum>?
             val wrapped: List<Any?> =
                 try {
-                  listOf(api.echoOptionalNullableInt(aNullableIntArg))
+                  listOf(api.echoNullableNonNullEnumMap(enumMapArg))
                 } catch (exception: Throwable) {
                   wrapError(exception)
                 }
@@ -2015,15 +2301,15 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableStringArg = args[0] as String?
+            val classMapArg = args[0] as Map<Long, AllNullableTypes>?
             val wrapped: List<Any?> =
                 try {
-                  listOf(api.echoNamedNullableString(aNullableStringArg))
+                  listOf(api.echoNullableNonNullClassMap(classMapArg))
                 } catch (exception: Throwable) {
                   wrapError(exception)
                 }
@@ -2037,18 +2323,19 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.noopAsync { result: Result<Unit> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(wrapError(error))
-              } else {
-                reply.reply(wrapResult(null))
-              }
-            }
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val anEnumArg = args[0] as AnEnum?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNullableEnum(anEnumArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
           }
         } else {
           channel.setMessageHandler(null)
@@ -2058,21 +2345,19 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAnotherNullableEnum$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anIntArg = args[0] as Long
-            api.echoAsyncInt(anIntArg) { result: Result<Long> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(wrapResult(data))
-              }
-            }
+            val anotherEnumArg = args[0] as AnotherEnum?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoAnotherNullableEnum(anotherEnumArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
           }
         } else {
           channel.setMessageHandler(null)
@@ -2082,19 +2367,108 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aDoubleArg = args[0] as Double
-            api.echoAsyncDouble(aDoubleArg) { result: Result<Double> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(wrapResult(data))
+            val aNullableIntArg = args[0] as Long?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoOptionalNullableInt(aNullableIntArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val aNullableStringArg = args[0] as String?
+            val wrapped: List<Any?> =
+                try {
+                  listOf(api.echoNamedNullableString(aNullableStringArg))
+                } catch (exception: Throwable) {
+                  wrapError(exception)
+                }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            api.noopAsync { result: Result<Unit> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                reply.reply(wrapResult(null))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val anIntArg = args[0] as Long
+            api.echoAsyncInt(anIntArg) { result: Result<Long> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val aDoubleArg = args[0] as Double
+            api.echoAsyncDouble(aDoubleArg) { result: Result<Double> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
               }
             }
           }
@@ -3349,6 +3723,55 @@ interface HostIntegrationCoreApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumListArg = args[0] as List<AnEnum>
+            api.callFlutterEchoNonNullEnumList(enumListArg) { result: Result<List<AnEnum>> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassList$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classListArg = args[0] as List<AllNullableTypes>
+            api.callFlutterEchoNonNullClassList(classListArg) {
+                result: Result<List<AllNullableTypes>> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel =
             BasicMessageChannel<Any?>(
@@ -3474,13 +3897,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullStringMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anEnumArg = args[0] as AnEnum
-            api.callFlutterEchoEnum(anEnumArg) { result: Result<AnEnum> ->
+            val stringMapArg = args[0] as Map<String, String>
+            api.callFlutterEchoNonNullStringMap(stringMapArg) { result: Result<Map<String, String>>
+              ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3498,13 +3922,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullIntMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anotherEnumArg = args[0] as AnotherEnum
-            api.callFlutterEchoAnotherEnum(anotherEnumArg) { result: Result<AnotherEnum> ->
+            val intMapArg = args[0] as Map<Long, Long>
+            api.callFlutterEchoNonNullIntMap(intMapArg) { result: Result<Map<Long, Long>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3522,13 +3946,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aBoolArg = args[0] as Boolean?
-            api.callFlutterEchoNullableBool(aBoolArg) { result: Result<Boolean?> ->
+            val enumMapArg = args[0] as Map<AnEnum, AnEnum>
+            api.callFlutterEchoNonNullEnumMap(enumMapArg) { result: Result<Map<AnEnum, AnEnum>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3546,13 +3970,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anIntArg = args[0] as Long?
-            api.callFlutterEchoNullableInt(anIntArg) { result: Result<Long?> ->
+            val classMapArg = args[0] as Map<Long, AllNullableTypes>
+            api.callFlutterEchoNonNullClassMap(classMapArg) {
+                result: Result<Map<Long, AllNullableTypes>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3570,13 +3995,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aDoubleArg = args[0] as Double?
-            api.callFlutterEchoNullableDouble(aDoubleArg) { result: Result<Double?> ->
+            val anEnumArg = args[0] as AnEnum
+            api.callFlutterEchoEnum(anEnumArg) { result: Result<AnEnum> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3594,13 +4019,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherEnum$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aStringArg = args[0] as String?
-            api.callFlutterEchoNullableString(aStringArg) { result: Result<String?> ->
+            val anotherEnumArg = args[0] as AnotherEnum
+            api.callFlutterEchoAnotherEnum(anotherEnumArg) { result: Result<AnotherEnum> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3618,13 +4043,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val listArg = args[0] as ByteArray?
-            api.callFlutterEchoNullableUint8List(listArg) { result: Result<ByteArray?> ->
+            val aBoolArg = args[0] as Boolean?
+            api.callFlutterEchoNullableBool(aBoolArg) { result: Result<Boolean?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3642,13 +4067,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val listArg = args[0] as List<Any?>?
-            api.callFlutterEchoNullableList(listArg) { result: Result<List<Any?>?> ->
+            val anIntArg = args[0] as Long?
+            api.callFlutterEchoNullableInt(anIntArg) { result: Result<Long?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3666,13 +4091,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val enumListArg = args[0] as List<AnEnum?>?
-            api.callFlutterEchoNullableEnumList(enumListArg) { result: Result<List<AnEnum?>?> ->
+            val aDoubleArg = args[0] as Double?
+            api.callFlutterEchoNullableDouble(aDoubleArg) { result: Result<Double?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3690,14 +4115,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val classListArg = args[0] as List<AllNullableTypes?>?
-            api.callFlutterEchoNullableClassList(classListArg) {
-                result: Result<List<AllNullableTypes?>?> ->
+            val aStringArg = args[0] as String?
+            api.callFlutterEchoNullableString(aStringArg) { result: Result<String?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3715,13 +4139,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val mapArg = args[0] as Map<Any?, Any?>?
-            api.callFlutterEchoNullableMap(mapArg) { result: Result<Map<Any?, Any?>?> ->
+            val listArg = args[0] as ByteArray?
+            api.callFlutterEchoNullableUint8List(listArg) { result: Result<ByteArray?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3739,14 +4163,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableStringMap$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val stringMapArg = args[0] as Map<String?, String?>?
-            api.callFlutterEchoNullableStringMap(stringMapArg) {
-                result: Result<Map<String?, String?>?> ->
+            val listArg = args[0] as List<Any?>?
+            api.callFlutterEchoNullableList(listArg) { result: Result<List<Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3764,13 +4187,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableIntMap$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumList$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val intMapArg = args[0] as Map<Long?, Long?>?
-            api.callFlutterEchoNullableIntMap(intMapArg) { result: Result<Map<Long?, Long?>?> ->
+            val enumListArg = args[0] as List<AnEnum?>?
+            api.callFlutterEchoNullableEnumList(enumListArg) { result: Result<List<AnEnum?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3788,14 +4211,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumMap$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassList$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val enumMapArg = args[0] as Map<AnEnum?, AnEnum?>?
-            api.callFlutterEchoNullableEnumMap(enumMapArg) { result: Result<Map<AnEnum?, AnEnum?>?>
-              ->
+            val classListArg = args[0] as List<AllNullableTypes?>?
+            api.callFlutterEchoNullableClassList(classListArg) {
+                result: Result<List<AllNullableTypes?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3813,14 +4236,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassMap$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val classMapArg = args[0] as Map<Long?, AllNullableTypes?>?
-            api.callFlutterEchoNullableClassMap(classMapArg) {
-                result: Result<Map<Long?, AllNullableTypes?>?> ->
+            val enumListArg = args[0] as List<AnEnum>?
+            api.callFlutterEchoNullableNonNullEnumList(enumListArg) { result: Result<List<AnEnum>?>
+              ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3838,13 +4261,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anEnumArg = args[0] as AnEnum?
-            api.callFlutterEchoNullableEnum(anEnumArg) { result: Result<AnEnum?> ->
+            val classListArg = args[0] as List<AllNullableTypes>?
+            api.callFlutterEchoNullableNonNullClassList(classListArg) {
+                result: Result<List<AllNullableTypes>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3862,13 +4286,13 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherNullableEnum$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anotherEnumArg = args[0] as AnotherEnum?
-            api.callFlutterEchoAnotherNullableEnum(anotherEnumArg) { result: Result<AnotherEnum?> ->
+            val mapArg = args[0] as Map<Any?, Any?>?
+            api.callFlutterEchoNullableMap(mapArg) { result: Result<Map<Any?, Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3886,13 +4310,14 @@ interface HostIntegrationCoreApi {
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
-                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString$separatedMessageChannelSuffix",
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableStringMap$separatedMessageChannelSuffix",
                 codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aStringArg = args[0] as String
-            api.callFlutterSmallApiEchoString(aStringArg) { result: Result<String> ->
+            val stringMapArg = args[0] as Map<String?, String?>?
+            api.callFlutterEchoNullableStringMap(stringMapArg) {
+                result: Result<Map<String?, String?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
                 reply.reply(wrapError(error))
@@ -3906,25 +4331,271 @@ interface HostIntegrationCoreApi {
           channel.setMessageHandler(null)
         }
       }
-    }
-  }
-}
-/**
- * The core interface that the Dart platform_test code implements for host integration tests to call
- * into.
- *
- * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin.
- */
-class FlutterIntegrationCoreApi(
-    private val binaryMessenger: BinaryMessenger,
-    private val messageChannelSuffix: String = ""
-) {
-  companion object {
-    /** The codec used by FlutterIntegrationCoreApi. */
-    val codec: MessageCodec<Any?> by lazy { CoreTestsPigeonCodec() }
-  }
-  /** A no-op function taking no arguments and returning no value, to sanity test basic calling. */
-  fun noop(callback: (Result<Unit>) -> Unit) {
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableIntMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val intMapArg = args[0] as Map<Long?, Long?>?
+            api.callFlutterEchoNullableIntMap(intMapArg) { result: Result<Map<Long?, Long?>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnumMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumMapArg = args[0] as Map<AnEnum?, AnEnum?>?
+            api.callFlutterEchoNullableEnumMap(enumMapArg) { result: Result<Map<AnEnum?, AnEnum?>?>
+              ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableClassMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classMapArg = args[0] as Map<Long?, AllNullableTypes?>?
+            api.callFlutterEchoNullableClassMap(classMapArg) {
+                result: Result<Map<Long?, AllNullableTypes?>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val stringMapArg = args[0] as Map<String, String>?
+            api.callFlutterEchoNullableNonNullStringMap(stringMapArg) {
+                result: Result<Map<String, String>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val intMapArg = args[0] as Map<Long, Long>?
+            api.callFlutterEchoNullableNonNullIntMap(intMapArg) { result: Result<Map<Long, Long>?>
+              ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val enumMapArg = args[0] as Map<AnEnum, AnEnum>?
+            api.callFlutterEchoNullableNonNullEnumMap(enumMapArg) {
+                result: Result<Map<AnEnum, AnEnum>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val classMapArg = args[0] as Map<Long, AllNullableTypes>?
+            api.callFlutterEchoNullableNonNullClassMap(classMapArg) {
+                result: Result<Map<Long, AllNullableTypes>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val anEnumArg = args[0] as AnEnum?
+            api.callFlutterEchoNullableEnum(anEnumArg) { result: Result<AnEnum?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAnotherNullableEnum$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val anotherEnumArg = args[0] as AnotherEnum?
+            api.callFlutterEchoAnotherNullableEnum(anotherEnumArg) { result: Result<AnotherEnum?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel =
+            BasicMessageChannel<Any?>(
+                binaryMessenger,
+                "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString$separatedMessageChannelSuffix",
+                codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val aStringArg = args[0] as String
+            api.callFlutterSmallApiEchoString(aStringArg) { result: Result<String> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+}
+/**
+ * The core interface that the Dart platform_test code implements for host integration tests to call
+ * into.
+ *
+ * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin.
+ */
+class FlutterIntegrationCoreApi(
+    private val binaryMessenger: BinaryMessenger,
+    private val messageChannelSuffix: String = ""
+) {
+  companion object {
+    /** The codec used by FlutterIntegrationCoreApi. */
+    val codec: MessageCodec<Any?> by lazy { CoreTestsPigeonCodec() }
+  }
+  /** A no-op function taking no arguments and returning no value, to sanity test basic calling. */
+  fun noop(callback: (Result<Unit>) -> Unit) {
     val separatedMessageChannelSuffix =
         if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
     val channelName =
@@ -4345,6 +5016,63 @@ class FlutterIntegrationCoreApi(
       }
     }
   }
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNonNullEnumList(enumListArg: List<AnEnum>, callback: (Result<List<AnEnum>>) -> Unit) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(enumListArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as List<AnEnum>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNonNullClassList(
+      classListArg: List<AllNullableTypes>,
+      callback: (Result<List<AllNullableTypes>>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(classListArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as List<AllNullableTypes>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoMap(mapArg: Map<Any?, Any?>, callback: (Result<Map<Any?, Any?>>) -> Unit) {
     val separatedMessageChannelSuffix =
@@ -4489,6 +5217,123 @@ class FlutterIntegrationCoreApi(
       }
     }
   }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullStringMap(
+      stringMapArg: Map<String, String>,
+      callback: (Result<Map<String, String>>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(stringMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as Map<String, String>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullIntMap(intMapArg: Map<Long, Long>, callback: (Result<Map<Long, Long>>) -> Unit) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(intMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as Map<Long, Long>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullEnumMap(
+      enumMapArg: Map<AnEnum, AnEnum>,
+      callback: (Result<Map<AnEnum, AnEnum>>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(enumMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as Map<AnEnum, AnEnum>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNonNullClassMap(
+      classMapArg: Map<Long, AllNullableTypes>,
+      callback: (Result<Map<Long, AllNullableTypes>>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(classMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else if (it[0] == null) {
+          callback(
+              Result.failure(
+                  FlutterError(
+                      "null-error",
+                      "Flutter api returned null value for non-null return value.",
+                      "")))
+        } else {
+          val output = it[0] as Map<Long, AllNullableTypes>
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
   /** Returns the passed enum to test serialization and deserialization. */
   fun echoEnum(anEnumArg: AnEnum, callback: (Result<AnEnum>) -> Unit) {
     val separatedMessageChannelSuffix =
@@ -4709,6 +5554,52 @@ class FlutterIntegrationCoreApi(
       }
     }
   }
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNullableNonNullEnumList(
+      enumListArg: List<AnEnum>?,
+      callback: (Result<List<AnEnum>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(enumListArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as List<AnEnum>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed list, to test serialization and deserialization. */
+  fun echoNullableNonNullClassList(
+      classListArg: List<AllNullableTypes>?,
+      callback: (Result<List<AllNullableTypes>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(classListArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as List<AllNullableTypes>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
   /** Returns the passed map, to test serialization and deserialization. */
   fun echoNullableMap(mapArg: Map<Any?, Any?>?, callback: (Result<Map<Any?, Any?>?>) -> Unit) {
     val separatedMessageChannelSuffix =
@@ -4821,6 +5712,98 @@ class FlutterIntegrationCoreApi(
       }
     }
   }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullStringMap(
+      stringMapArg: Map<String, String>?,
+      callback: (Result<Map<String, String>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(stringMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as Map<String, String>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullIntMap(
+      intMapArg: Map<Long, Long>?,
+      callback: (Result<Map<Long, Long>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(intMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as Map<Long, Long>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullEnumMap(
+      enumMapArg: Map<AnEnum, AnEnum>?,
+      callback: (Result<Map<AnEnum, AnEnum>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(enumMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as Map<AnEnum, AnEnum>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
+  /** Returns the passed map, to test serialization and deserialization. */
+  fun echoNullableNonNullClassMap(
+      classMapArg: Map<Long, AllNullableTypes>?,
+      callback: (Result<Map<Long, AllNullableTypes>?>) -> Unit
+  ) {
+    val separatedMessageChannelSuffix =
+        if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+    val channelName =
+        "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap$separatedMessageChannelSuffix"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(classMapArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          val output = it[0] as Map<Long, AllNullableTypes>?
+          callback(Result.success(output))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      }
+    }
+  }
   /** Returns the passed enum to test serialization and deserialization. */
   fun echoNullableEnum(anEnumArg: AnEnum?, callback: (Result<AnEnum?>) -> Unit) {
     val separatedMessageChannelSuffix =
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt
index e8235f9d0dc..9563941624d 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt
+++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt
@@ -98,6 +98,14 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  override fun echoNonNullEnumList(enumList: List<AnEnum>): List<AnEnum> {
+    return enumList
+  }
+
+  override fun echoNonNullClassList(classList: List<AllNullableTypes>): List<AllNullableTypes> {
+    return classList
+  }
+
   override fun echoMap(map: Map<Any?, Any?>): Map<Any?, Any?> {
     return map
   }
@@ -120,6 +128,24 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  override fun echoNonNullStringMap(stringMap: Map<String, String>): Map<String, String> {
+    return stringMap
+  }
+
+  override fun echoNonNullIntMap(intMap: Map<Long, Long>): Map<Long, Long> {
+    return intMap
+  }
+
+  override fun echoNonNullEnumMap(enumMap: Map<AnEnum, AnEnum>): Map<AnEnum, AnEnum> {
+    return enumMap
+  }
+
+  override fun echoNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>
+  ): Map<Long, AllNullableTypes> {
+    return classMap
+  }
+
   override fun echoClassWrapper(wrapper: AllClassesWrapper): AllClassesWrapper {
     return wrapper
   }
@@ -215,6 +241,16 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  override fun echoNullableNonNullEnumList(enumList: List<AnEnum>?): List<AnEnum>? {
+    return enumList
+  }
+
+  override fun echoNullableNonNullClassList(
+      classList: List<AllNullableTypes>?
+  ): List<AllNullableTypes>? {
+    return classList
+  }
+
   override fun echoNullableMap(map: Map<Any?, Any?>?): Map<Any?, Any?>? {
     return map
   }
@@ -237,6 +273,24 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  override fun echoNullableNonNullStringMap(stringMap: Map<String, String>?): Map<String, String>? {
+    return stringMap
+  }
+
+  override fun echoNullableNonNullIntMap(intMap: Map<Long, Long>?): Map<Long, Long>? {
+    return intMap
+  }
+
+  override fun echoNullableNonNullEnumMap(enumMap: Map<AnEnum, AnEnum>?): Map<AnEnum, AnEnum>? {
+    return enumMap
+  }
+
+  override fun echoNullableNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>?
+  ): Map<Long, AllNullableTypes>? {
+    return classMap
+  }
+
   override fun echoNullableEnum(anEnum: AnEnum?): AnEnum? {
     return anEnum
   }
@@ -547,6 +601,20 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     flutterApi!!.echoClassList(classList) { echo -> callback(echo) }
   }
 
+  override fun callFlutterEchoNonNullEnumList(
+      enumList: List<AnEnum>,
+      callback: (Result<List<AnEnum>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullEnumList(enumList) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNonNullClassList(
+      classList: List<AllNullableTypes>,
+      callback: (Result<List<AllNullableTypes>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullClassList(classList) { echo -> callback(echo) }
+  }
+
   override fun callFlutterEchoMap(
       map: Map<Any?, Any?>,
       callback: (Result<Map<Any?, Any?>>) -> Unit
@@ -582,6 +650,34 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     flutterApi!!.echoClassMap(classMap) { echo -> callback(echo) }
   }
 
+  override fun callFlutterEchoNonNullStringMap(
+      stringMap: Map<String, String>,
+      callback: (Result<Map<String, String>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullStringMap(stringMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNonNullIntMap(
+      intMap: Map<Long, Long>,
+      callback: (Result<Map<Long, Long>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullIntMap(intMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNonNullEnumMap(
+      enumMap: Map<AnEnum, AnEnum>,
+      callback: (Result<Map<AnEnum, AnEnum>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullEnumMap(enumMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>,
+      callback: (Result<Map<Long, AllNullableTypes>>) -> Unit
+  ) {
+    flutterApi!!.echoNonNullClassMap(classMap) { echo -> callback(echo) }
+  }
+
   override fun callFlutterEchoEnum(anEnum: AnEnum, callback: (Result<AnEnum>) -> Unit) {
     flutterApi!!.echoEnum(anEnum) { echo -> callback(echo) }
   }
@@ -650,6 +746,20 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     flutterApi!!.echoNullableClassList(classList) { echo -> callback(echo) }
   }
 
+  override fun callFlutterEchoNullableNonNullEnumList(
+      enumList: List<AnEnum>?,
+      callback: (Result<List<AnEnum>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullEnumList(enumList) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNullableNonNullClassList(
+      classList: List<AllNullableTypes>?,
+      callback: (Result<List<AllNullableTypes>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullClassList(classList) { echo -> callback(echo) }
+  }
+
   override fun callFlutterEchoNullableMap(
       map: Map<Any?, Any?>?,
       callback: (Result<Map<Any?, Any?>?>) -> Unit
@@ -685,6 +795,34 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi {
     flutterApi!!.echoNullableClassMap(classMap) { echo -> callback(echo) }
   }
 
+  override fun callFlutterEchoNullableNonNullStringMap(
+      stringMap: Map<String, String>?,
+      callback: (Result<Map<String, String>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullStringMap(stringMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNullableNonNullIntMap(
+      intMap: Map<Long, Long>?,
+      callback: (Result<Map<Long, Long>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullIntMap(intMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNullableNonNullEnumMap(
+      enumMap: Map<AnEnum, AnEnum>?,
+      callback: (Result<Map<AnEnum, AnEnum>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullEnumMap(enumMap) { echo -> callback(echo) }
+  }
+
+  override fun callFlutterEchoNullableNonNullClassMap(
+      classMap: Map<Long, AllNullableTypes>?,
+      callback: (Result<Map<Long, AllNullableTypes>?>) -> Unit
+  ) {
+    flutterApi!!.echoNullableNonNullClassMap(classMap) { echo -> callback(echo) }
+  }
+
   override fun callFlutterEchoNullableEnum(anEnum: AnEnum?, callback: (Result<AnEnum?>) -> Unit) {
     flutterApi!!.echoNullableEnum(anEnum) { echo -> callback(echo) }
   }
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
index 61296f6526e..25c771ee576 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
+++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
@@ -118,10 +118,12 @@ internal class AllDatatypesTest {
             boolList = listOf(true, false),
             intList = listOf(1, 2),
             doubleList = listOf(1.1, 2.2),
+            objectList = listOf(1, 2, 3),
             listList = listOf(stringList, stringList.toList()),
             map = mapOf("hello" to 1234),
             stringMap = mapOf("hello" to "you"),
-            intMap = mapOf(1L to 0L))
+            intMap = mapOf(1L to 0L),
+            objectMap = mapOf("hello" to 1234))
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = FlutterIntegrationCoreApi(binaryMessenger)
 
diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
index 9c3fca0ec00..adfdc9ea8ed 100644
--- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
+++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
@@ -62,10 +62,12 @@ class AllDatatypesTests: XCTestCase {
       intList: [1, 2],
       doubleList: [1.1, 2.2],
       boolList: [true, false],
+      objectList: ["string", 2],
       listList: [[true], [false]],
       map: ["hello": 1234],
       stringMap: ["hello": "you"],
-      intMap: [1: 0]
+      intMap: [1: 0],
+      objectMap: ["hello": 1234]
     )
 
     let binaryMessenger = EchoBinaryMessenger(codec: CoreTestsPigeonCodec.shared)
@@ -90,6 +92,7 @@ class AllDatatypesTests: XCTestCase {
         XCTAssert(equalsList(res!.intList, everything.intList))
         XCTAssert(equalsList(res!.doubleList, everything.doubleList))
         XCTAssert(equalsList(res!.boolList, everything.boolList))
+        XCTAssert(equalsList(res!.objectList, everything.objectList))
         if res!.listList != nil {
           for (index, list) in res!.listList!.enumerated() {
             XCTAssert(equalsList(list, everything.listList![index]))
@@ -98,6 +101,7 @@ class AllDatatypesTests: XCTestCase {
         XCTAssert(equalsDictionary(res!.map, everything.map))
         XCTAssert(equalsDictionary(res!.stringMap, everything.stringMap))
         XCTAssert(equalsDictionary(res!.intMap, everything.intMap))
+        XCTAssert(equalsDictionary(res!.objectMap, everything.objectMap))
         expectation.fulfill()
         return
       case .failure(_):
diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
index 72e34addd2d..0101cd8c075 100644
--- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
+++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
@@ -122,16 +122,18 @@ struct AllTypes {
   var aString: String
   var anObject: Any
   var list: [Any?]
-  var stringList: [String?]
-  var intList: [Int64?]
-  var doubleList: [Double?]
-  var boolList: [Bool?]
-  var enumList: [AnEnum?]
-  var listList: [[Any?]?]
+  var stringList: [String]
+  var intList: [Int64]
+  var doubleList: [Double]
+  var boolList: [Bool]
+  var enumList: [AnEnum]
+  var objectList: [Any]
+  var listList: [[Any?]]
   var map: [AnyHashable?: Any?]
-  var stringMap: [String?: String?]
-  var intMap: [Int64?: Int64?]
-  var enumMap: [AnEnum?: AnEnum?]
+  var stringMap: [String: String]
+  var intMap: [Int64: Int64]
+  var enumMap: [AnEnum: AnEnum]
+  var objectMap: [AnyHashable: Any]
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllTypes? {
@@ -148,16 +150,18 @@ struct AllTypes {
     let aString = pigeonVar_list[10] as! String
     let anObject = pigeonVar_list[11]!
     let list = pigeonVar_list[12] as! [Any?]
-    let stringList = pigeonVar_list[13] as! [String?]
-    let intList = pigeonVar_list[14] as! [Int64?]
-    let doubleList = pigeonVar_list[15] as! [Double?]
-    let boolList = pigeonVar_list[16] as! [Bool?]
-    let enumList = pigeonVar_list[17] as! [AnEnum?]
-    let listList = pigeonVar_list[18] as! [[Any?]?]
-    let map = pigeonVar_list[19] as! [AnyHashable?: Any?]
-    let stringMap = pigeonVar_list[20] as! [String?: String?]
-    let intMap = pigeonVar_list[21] as! [Int64?: Int64?]
-    let enumMap = pigeonVar_list[22] as? [AnEnum?: AnEnum?]
+    let stringList = pigeonVar_list[13] as! [String]
+    let intList = pigeonVar_list[14] as! [Int64]
+    let doubleList = pigeonVar_list[15] as! [Double]
+    let boolList = pigeonVar_list[16] as! [Bool]
+    let enumList = pigeonVar_list[17] as! [AnEnum]
+    let objectList = pigeonVar_list[18] as! [Any]
+    let listList = pigeonVar_list[19] as! [[Any?]]
+    let map = pigeonVar_list[20] as! [AnyHashable?: Any?]
+    let stringMap = pigeonVar_list[21] as! [String: String]
+    let intMap = pigeonVar_list[22] as! [Int64: Int64]
+    let enumMap = pigeonVar_list[23] as? [AnEnum: AnEnum]
+    let objectMap = pigeonVar_list[24] as! [AnyHashable: Any]
 
     return AllTypes(
       aBool: aBool,
@@ -178,11 +182,13 @@ struct AllTypes {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
-      enumMap: enumMap!
+      enumMap: enumMap!,
+      objectMap: objectMap
     )
   }
   func toList() -> [Any?] {
@@ -205,11 +211,13 @@ struct AllTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ]
   }
 }
@@ -238,12 +246,14 @@ class AllNullableTypes {
     doubleList: [Double?]? = nil,
     boolList: [Bool?]? = nil,
     enumList: [AnEnum?]? = nil,
+    objectList: [Any?]? = nil,
     listList: [[Any?]?]? = nil,
     recursiveClassList: [AllNullableTypes?]? = nil,
     map: [AnyHashable?: Any?]? = nil,
     stringMap: [String?: String?]? = nil,
     intMap: [Int64?: Int64?]? = nil,
     enumMap: [AnEnum?: AnEnum?]? = nil,
+    objectMap: [AnyHashable?: Any?]? = nil,
     recursiveClassMap: [Int64?: AllNullableTypes?]? = nil
   ) {
     self.aNullableBool = aNullableBool
@@ -265,12 +275,14 @@ class AllNullableTypes {
     self.doubleList = doubleList
     self.boolList = boolList
     self.enumList = enumList
+    self.objectList = objectList
     self.listList = listList
     self.recursiveClassList = recursiveClassList
     self.map = map
     self.stringMap = stringMap
     self.intMap = intMap
     self.enumMap = enumMap
+    self.objectMap = objectMap
     self.recursiveClassMap = recursiveClassMap
   }
   var aNullableBool: Bool?
@@ -292,12 +304,14 @@ class AllNullableTypes {
   var doubleList: [Double?]?
   var boolList: [Bool?]?
   var enumList: [AnEnum?]?
+  var objectList: [Any?]?
   var listList: [[Any?]?]?
   var recursiveClassList: [AllNullableTypes?]?
   var map: [AnyHashable?: Any?]?
   var stringMap: [String?: String?]?
   var intMap: [Int64?: Int64?]?
   var enumMap: [AnEnum?: AnEnum?]?
+  var objectMap: [AnyHashable?: Any?]?
   var recursiveClassMap: [Int64?: AllNullableTypes?]?
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -321,13 +335,15 @@ class AllNullableTypes {
     let doubleList: [Double?]? = nilOrValue(pigeonVar_list[16])
     let boolList: [Bool?]? = nilOrValue(pigeonVar_list[17])
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[18])
-    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
-    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[20])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[21])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[22])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[23])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[24] as? [AnEnum?: AnEnum?]
-    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[25])
+    let objectList: [Any?]? = nilOrValue(pigeonVar_list[19])
+    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[20])
+    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[21])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[22])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[23])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[24])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[25] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[26])
+    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[27])
 
     return AllNullableTypes(
       aNullableBool: aNullableBool,
@@ -349,12 +365,14 @@ class AllNullableTypes {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       recursiveClassList: recursiveClassList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
+      objectMap: objectMap,
       recursiveClassMap: recursiveClassMap
     )
   }
@@ -379,12 +397,14 @@ class AllNullableTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
       recursiveClassMap,
     ]
   }
@@ -414,11 +434,13 @@ struct AllNullableTypesWithoutRecursion {
   var doubleList: [Double?]? = nil
   var boolList: [Bool?]? = nil
   var enumList: [AnEnum?]? = nil
+  var objectList: [Any?]? = nil
   var listList: [[Any?]?]? = nil
   var map: [AnyHashable?: Any?]? = nil
   var stringMap: [String?: String?]? = nil
   var intMap: [Int64?: Int64?]? = nil
   var enumMap: [AnEnum?: AnEnum?]? = nil
+  var objectMap: [AnyHashable?: Any?]? = nil
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllNullableTypesWithoutRecursion? {
@@ -440,11 +462,13 @@ struct AllNullableTypesWithoutRecursion {
     let doubleList: [Double?]? = nilOrValue(pigeonVar_list[15])
     let boolList: [Bool?]? = nilOrValue(pigeonVar_list[16])
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[17])
-    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[18])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[19])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[20])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[21])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[22] as? [AnEnum?: AnEnum?]
+    let objectList: [Any?]? = nilOrValue(pigeonVar_list[18])
+    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[20])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[21])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[22])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[23] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[24])
 
     return AllNullableTypesWithoutRecursion(
       aNullableBool: aNullableBool,
@@ -465,11 +489,13 @@ struct AllNullableTypesWithoutRecursion {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
-      enumMap: enumMap
+      enumMap: enumMap,
+      objectMap: objectMap
     )
   }
   func toList() -> [Any?] {
@@ -492,11 +518,13 @@ struct AllNullableTypesWithoutRecursion {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ]
   }
 }
@@ -686,6 +714,10 @@ protocol HostIntegrationCoreApi {
   func echo(enumList: [AnEnum?]) throws -> [AnEnum?]
   /// Returns the passed list, to test serialization and deserialization.
   func echo(classList: [AllNullableTypes?]) throws -> [AllNullableTypes?]
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(enumList: [AnEnum]) throws -> [AnEnum]
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(classList: [AllNullableTypes]) throws -> [AllNullableTypes]
   /// Returns the passed map, to test serialization and deserialization.
   func echo(_ map: [AnyHashable?: Any?]) throws -> [AnyHashable?: Any?]
   /// Returns the passed map, to test serialization and deserialization.
@@ -696,6 +728,14 @@ protocol HostIntegrationCoreApi {
   func echo(enumMap: [AnEnum?: AnEnum?]) throws -> [AnEnum?: AnEnum?]
   /// Returns the passed map, to test serialization and deserialization.
   func echo(classMap: [Int64?: AllNullableTypes?]) throws -> [Int64?: AllNullableTypes?]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(stringMap: [String: String]) throws -> [String: String]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(intMap: [Int64: Int64]) throws -> [Int64: Int64]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(enumMap: [AnEnum: AnEnum]) throws -> [AnEnum: AnEnum]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(classMap: [Int64: AllNullableTypes]) throws -> [Int64: AllNullableTypes]
   /// Returns the passed class to test nested class serialization and deserialization.
   func echo(_ wrapper: AllClassesWrapper) throws -> AllClassesWrapper
   /// Returns the passed enum to test serialization and deserialization.
@@ -745,6 +785,10 @@ protocol HostIntegrationCoreApi {
   func echoNullable(enumList: [AnEnum?]?) throws -> [AnEnum?]?
   /// Returns the passed list, to test serialization and deserialization.
   func echoNullable(classList: [AllNullableTypes?]?) throws -> [AllNullableTypes?]?
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(enumList: [AnEnum]?) throws -> [AnEnum]?
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(classList: [AllNullableTypes]?) throws -> [AllNullableTypes]?
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(_ map: [AnyHashable?: Any?]?) throws -> [AnyHashable?: Any?]?
   /// Returns the passed map, to test serialization and deserialization.
@@ -755,6 +799,15 @@ protocol HostIntegrationCoreApi {
   func echoNullable(enumMap: [AnEnum?: AnEnum?]?) throws -> [AnEnum?: AnEnum?]?
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(classMap: [Int64?: AllNullableTypes?]?) throws -> [Int64?: AllNullableTypes?]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(stringMap: [String: String]?) throws -> [String: String]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(intMap: [Int64: Int64]?) throws -> [Int64: Int64]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(enumMap: [AnEnum: AnEnum]?) throws -> [AnEnum: AnEnum]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(classMap: [Int64: AllNullableTypes]?) throws -> [Int64:
+    AllNullableTypes]?
   func echoNullable(_ anEnum: AnEnum?) throws -> AnEnum?
   func echoNullable(_ anotherEnum: AnotherEnum?) throws -> AnotherEnum?
   /// Returns passed in int.
@@ -902,6 +955,11 @@ protocol HostIntegrationCoreApi {
   func callFlutterEcho(
     classList: [AllNullableTypes?],
     completion: @escaping (Result<[AllNullableTypes?], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    enumList: [AnEnum], completion: @escaping (Result<[AnEnum], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    classList: [AllNullableTypes], completion: @escaping (Result<[AllNullableTypes], Error>) -> Void
+  )
   func callFlutterEcho(
     _ map: [AnyHashable?: Any?], completion: @escaping (Result<[AnyHashable?: Any?], Error>) -> Void
   )
@@ -915,6 +973,15 @@ protocol HostIntegrationCoreApi {
   func callFlutterEcho(
     classMap: [Int64?: AllNullableTypes?],
     completion: @escaping (Result<[Int64?: AllNullableTypes?], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    stringMap: [String: String], completion: @escaping (Result<[String: String], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    intMap: [Int64: Int64], completion: @escaping (Result<[Int64: Int64], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    enumMap: [AnEnum: AnEnum], completion: @escaping (Result<[AnEnum: AnEnum], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    classMap: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], Error>) -> Void)
   func callFlutterEcho(_ anEnum: AnEnum, completion: @escaping (Result<AnEnum, Error>) -> Void)
   func callFlutterEcho(
     _ anotherEnum: AnotherEnum, completion: @escaping (Result<AnotherEnum, Error>) -> Void)
@@ -935,6 +1002,11 @@ protocol HostIntegrationCoreApi {
   func callFlutterEchoNullable(
     classList: [AllNullableTypes?]?,
     completion: @escaping (Result<[AllNullableTypes?]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    enumList: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    classList: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, Error>) -> Void)
   func callFlutterEchoNullable(
     _ map: [AnyHashable?: Any?]?,
     completion: @escaping (Result<[AnyHashable?: Any?]?, Error>) -> Void)
@@ -949,6 +1021,15 @@ protocol HostIntegrationCoreApi {
   func callFlutterEchoNullable(
     classMap: [Int64?: AllNullableTypes?]?,
     completion: @escaping (Result<[Int64?: AllNullableTypes?]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    stringMap: [String: String]?, completion: @escaping (Result<[String: String]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    intMap: [Int64: Int64]?, completion: @escaping (Result<[Int64: Int64]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    enumMap: [AnEnum: AnEnum]?, completion: @escaping (Result<[AnEnum: AnEnum]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    classMap: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, Error>) -> Void)
   func callFlutterEchoNullable(
     _ anEnum: AnEnum?, completion: @escaping (Result<AnEnum?, Error>) -> Void)
   func callFlutterEchoNullable(
@@ -1225,6 +1306,44 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoClassListChannel.setMessageHandler(nil)
     }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg = args[0] as! [AnEnum]
+        do {
+          let result = try api.echoNonNull(enumList: enumListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg = args[0] as! [AllNullableTypes]
+        do {
+          let result = try api.echoNonNull(classList: classListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullClassListChannel.setMessageHandler(nil)
+    }
     /// Returns the passed map, to test serialization and deserialization.
     let echoMapChannel = FlutterBasicMessageChannel(
       name:
@@ -1320,6 +1439,82 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoClassMapChannel.setMessageHandler(nil)
     }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg = args[0] as! [String: String]
+        do {
+          let result = try api.echoNonNull(stringMap: stringMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg = args[0] as! [Int64: Int64]
+        do {
+          let result = try api.echoNonNull(intMap: intMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg = args[0] as? [AnEnum: AnEnum]
+        do {
+          let result = try api.echoNonNull(enumMap: enumMapArg!)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg = args[0] as! [Int64: AllNullableTypes]
+        do {
+          let result = try api.echoNonNull(classMap: classMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullClassMapChannel.setMessageHandler(nil)
+    }
     /// Returns the passed class to test nested class serialization and deserialization.
     let echoClassWrapperChannel = FlutterBasicMessageChannel(
       name:
@@ -1727,6 +1922,44 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoNullableClassListChannel.setMessageHandler(nil)
     }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNullableNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg: [AnEnum]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(enumList: enumListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNullableNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg: [AllNullableTypes]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(classList: classListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullClassListChannel.setMessageHandler(nil)
+    }
     /// Returns the passed map, to test serialization and deserialization.
     let echoNullableMapChannel = FlutterBasicMessageChannel(
       name:
@@ -1822,6 +2055,82 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoNullableClassMapChannel.setMessageHandler(nil)
     }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg: [String: String]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(stringMap: stringMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg: [Int64: Int64]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(intMap: intMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg: [AnEnum: AnEnum]? = args[0] as? [AnEnum: AnEnum]
+        do {
+          let result = try api.echoNullableNonNull(enumMap: enumMapArg!)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg: [Int64: AllNullableTypes]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(classMap: classMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let echoNullableEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum\(channelSuffix)",
@@ -3031,6 +3340,46 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoClassListChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg = args[0] as! [AnEnum]
+        api.callFlutterEchoNonNull(enumList: enumListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg = args[0] as! [AllNullableTypes]
+        api.callFlutterEchoNonNull(classList: classListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullClassListChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoMapChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap\(channelSuffix)",
@@ -3131,6 +3480,86 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoClassMapChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg = args[0] as! [String: String]
+        api.callFlutterEchoNonNull(stringMap: stringMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg = args[0] as! [Int64: Int64]
+        api.callFlutterEchoNonNull(intMap: intMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg = args[0] as? [AnEnum: AnEnum]
+        api.callFlutterEchoNonNull(enumMap: enumMapArg!) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg = args[0] as! [Int64: AllNullableTypes]
+        api.callFlutterEchoNonNull(classMap: classMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum\(channelSuffix)",
@@ -3331,6 +3760,46 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoNullableClassListChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNullableNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg: [AnEnum]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(enumList: enumListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg: [AllNullableTypes]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(classList: classListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullClassListChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap\(channelSuffix)",
@@ -3431,6 +3900,86 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoNullableClassMapChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNullableNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg: [String: String]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(stringMap: stringMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg: [Int64: Int64]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(intMap: intMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg: [AnEnum: AnEnum]? = args[0] as? [AnEnum: AnEnum]
+        api.callFlutterEchoNullableNonNull(enumMap: enumMapArg!) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg: [Int64: AllNullableTypes]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(classMap: classMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoNullableEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum\(channelSuffix)",
@@ -3551,6 +4100,13 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echo(
     classList classListArg: [AllNullableTypes?],
     completion: @escaping (Result<[AllNullableTypes?], PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    enumList enumListArg: [AnEnum], completion: @escaping (Result<[AnEnum], PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    classList classListArg: [AllNullableTypes],
+    completion: @escaping (Result<[AllNullableTypes], PigeonError>) -> Void)
   /// Returns the passed map, to test serialization and deserialization.
   func echo(
     _ mapArg: [AnyHashable?: Any?],
@@ -3571,6 +4127,22 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echo(
     classMap classMapArg: [Int64?: AllNullableTypes?],
     completion: @escaping (Result<[Int64?: AllNullableTypes?], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    stringMap stringMapArg: [String: String],
+    completion: @escaping (Result<[String: String], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    intMap intMapArg: [Int64: Int64],
+    completion: @escaping (Result<[Int64: Int64], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum],
+    completion: @escaping (Result<[AnEnum: AnEnum], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
   func echo(_ anEnumArg: AnEnum, completion: @escaping (Result<AnEnum, PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
@@ -3601,6 +4173,13 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echoNullable(
     classList classListArg: [AllNullableTypes?]?,
     completion: @escaping (Result<[AllNullableTypes?]?, PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumList enumListArg: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classList classListArg: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, PigeonError>) -> Void)
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(
     _ mapArg: [AnyHashable?: Any?]?,
@@ -3621,6 +4200,22 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echoNullable(
     classMap classMapArg: [Int64?: AllNullableTypes?]?,
     completion: @escaping (Result<[Int64?: AllNullableTypes?]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    stringMap stringMapArg: [String: String]?,
+    completion: @escaping (Result<[String: String]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    intMap intMapArg: [Int64: Int64]?,
+    completion: @escaping (Result<[Int64: Int64]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum]?,
+    completion: @escaping (Result<[AnEnum: AnEnum]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
   func echoNullable(
     _ anEnumArg: AnEnum?, completion: @escaping (Result<AnEnum?, PigeonError>) -> Void)
@@ -4091,6 +4686,67 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    enumList enumListArg: [AnEnum], completion: @escaping (Result<[AnEnum], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [AnEnum]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    classList classListArg: [AllNullableTypes],
+    completion: @escaping (Result<[AllNullableTypes], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [AllNullableTypes]
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   func echo(
     _ mapArg: [AnyHashable?: Any?],
@@ -4246,6 +4902,130 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    stringMap stringMapArg: [String: String],
+    completion: @escaping (Result<[String: String], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([stringMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [String: String]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    intMap intMapArg: [Int64: Int64],
+    completion: @escaping (Result<[Int64: Int64], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([intMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [Int64: Int64]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum],
+    completion: @escaping (Result<[AnEnum: AnEnum], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as? [AnEnum: AnEnum]
+        completion(.success(result!))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [Int64: AllNullableTypes]
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed enum to test serialization and deserialization.
   func echo(_ anEnumArg: AnEnum, completion: @escaping (Result<AnEnum, PigeonError>) -> Void) {
     let channelName: String =
@@ -4496,6 +5276,55 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumList enumListArg: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AnEnum]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classList classListArg: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AllNullableTypes]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(
     _ mapArg: [AnyHashable?: Any?]?,
@@ -4621,6 +5450,106 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    stringMap stringMapArg: [String: String]?,
+    completion: @escaping (Result<[String: String]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([stringMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [String: String]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    intMap intMapArg: [Int64: Int64]?,
+    completion: @escaping (Result<[Int64: Int64]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([intMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [Int64: Int64]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum]?,
+    completion: @escaping (Result<[AnEnum: AnEnum]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AnEnum: AnEnum]? = listResponse[0] as? [AnEnum: AnEnum]
+        completion(.success(result!))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [Int64: AllNullableTypes]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed enum to test serialization and deserialization.
   func echoNullable(
     _ anEnumArg: AnEnum?, completion: @escaping (Result<AnEnum?, PigeonError>) -> Void
diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift
index 6208821b9b0..f94d0be9eff 100644
--- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift
+++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift
@@ -95,6 +95,14 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  func echoNonNull(enumList: [AnEnum]) throws -> [AnEnum] {
+    return enumList
+  }
+
+  func echoNonNull(classList: [AllNullableTypes]) throws -> [AllNullableTypes] {
+    return classList
+  }
+
   func echo(_ map: [AnyHashable?: Any?]) throws -> [AnyHashable?: Any?] {
     return map
   }
@@ -115,6 +123,22 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  func echoNonNull(stringMap: [String: String]) throws -> [String: String] {
+    return stringMap
+  }
+
+  func echoNonNull(intMap: [Int64: Int64]) throws -> [Int64: Int64] {
+    return intMap
+  }
+
+  func echoNonNull(enumMap: [AnEnum: AnEnum]) throws -> [AnEnum: AnEnum] {
+    return enumMap
+  }
+
+  func echoNonNull(classMap: [Int64: AllNullableTypes]) throws -> [Int64: AllNullableTypes] {
+    return classMap
+  }
+
   func echo(_ wrapper: AllClassesWrapper) throws -> AllClassesWrapper {
     return wrapper
   }
@@ -201,6 +225,14 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  func echoNullableNonNull(enumList: [AnEnum]?) throws -> [AnEnum]? {
+    return enumList
+  }
+
+  func echoNullableNonNull(classList: [AllNullableTypes]?) throws -> [AllNullableTypes]? {
+    return classList
+  }
+
   func echoNullable(_ map: [AnyHashable?: Any?]?) throws -> [AnyHashable?: Any?]? {
     return map
   }
@@ -221,6 +253,24 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  func echoNullableNonNull(stringMap: [String: String]?) throws -> [String: String]? {
+    return stringMap
+  }
+
+  func echoNullableNonNull(intMap: [Int64: Int64]?) throws -> [Int64: Int64]? {
+    return intMap
+  }
+
+  func echoNullableNonNull(enumMap: [AnEnum: AnEnum]?) throws -> [AnEnum: AnEnum]? {
+    return enumMap
+  }
+
+  func echoNullableNonNull(classMap: [Int64: AllNullableTypes]?) throws -> [Int64:
+    AllNullableTypes]?
+  {
+    return classMap
+  }
+
   func echoNullable(_ anEnum: AnEnum?) throws -> AnEnum? {
     return anEnum
   }
@@ -653,6 +703,32 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNonNull(
+    enumList: [AnEnum], completion: @escaping (Result<[AnEnum], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(enumList: enumList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    classList: [AllNullableTypes], completion: @escaping (Result<[AllNullableTypes], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(classList: classList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEcho(
     _ map: [AnyHashable?: Any?], completion: @escaping (Result<[AnyHashable?: Any?], Error>) -> Void
   ) {
@@ -719,6 +795,59 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNonNull(
+    stringMap: [String: String], completion: @escaping (Result<[String: String], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(stringMap: stringMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    intMap: [Int64: Int64], completion: @escaping (Result<[Int64: Int64], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(intMap: intMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    enumMap: [AnEnum: AnEnum], completion: @escaping (Result<[AnEnum: AnEnum], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(enumMap: enumMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    classMap: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(classMap: classMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEcho(
     _ anEnum: AnEnum, completion: @escaping (Result<AnEnum, Error>) -> Void
   ) {
@@ -850,6 +979,33 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNullableNonNull(
+    enumList: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(enumList: enumList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    classList: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(classList: classList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEchoNullable(
     _ map: [AnyHashable?: Any?]?,
     completion: @escaping (Result<[AnyHashable?: Any?]?, Error>) -> Void
@@ -918,6 +1074,59 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNullableNonNull(
+    stringMap: [String: String]?, completion: @escaping (Result<[String: String]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(stringMap: stringMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    intMap: [Int64: Int64]?, completion: @escaping (Result<[Int64: Int64]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(intMap: intMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    enumMap: [AnEnum: AnEnum]?, completion: @escaping (Result<[AnEnum: AnEnum]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(enumMap: enumMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    classMap: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(classMap: classMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEchoNullable(
     _ anEnum: AnEnum?, completion: @escaping (Result<AnEnum?, Error>) -> Void
   ) {
diff --git a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
index 4fde1fa2036..fd388faa3e7 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
+++ b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
@@ -94,11 +94,13 @@ struct _CoreTestsPigeonTestAllTypes {
   FlValue* double_list;
   FlValue* bool_list;
   FlValue* enum_list;
+  FlValue* object_list;
   FlValue* list_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
+  FlValue* object_map;
 };
 
 G_DEFINE_TYPE(CoreTestsPigeonTestAllTypes, core_tests_pigeon_test_all_types,
@@ -114,11 +116,13 @@ static void core_tests_pigeon_test_all_types_dispose(GObject* object) {
   g_clear_pointer(&self->double_list, fl_value_unref);
   g_clear_pointer(&self->bool_list, fl_value_unref);
   g_clear_pointer(&self->enum_list, fl_value_unref);
+  g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
+  g_clear_pointer(&self->object_map, fl_value_unref);
   G_OBJECT_CLASS(core_tests_pigeon_test_all_types_parent_class)
       ->dispose(object);
 }
@@ -141,8 +145,8 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
     CoreTestsPigeonTestAnotherEnum another_enum, const gchar* a_string,
     FlValue* an_object, FlValue* list, FlValue* string_list, FlValue* int_list,
     FlValue* double_list, FlValue* bool_list, FlValue* enum_list,
-    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
-    FlValue* enum_map) {
+    FlValue* object_list, FlValue* list_list, FlValue* map, FlValue* string_map,
+    FlValue* int_map, FlValue* enum_map, FlValue* object_map) {
   CoreTestsPigeonTestAllTypes* self = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
       g_object_new(core_tests_pigeon_test_all_types_get_type(), nullptr));
   self->a_bool = a_bool;
@@ -174,11 +178,13 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
   self->double_list = fl_value_ref(double_list);
   self->bool_list = fl_value_ref(bool_list);
   self->enum_list = fl_value_ref(enum_list);
+  self->object_list = fl_value_ref(object_list);
   self->list_list = fl_value_ref(list_list);
   self->map = fl_value_ref(map);
   self->string_map = fl_value_ref(string_map);
   self->int_map = fl_value_ref(int_map);
   self->enum_map = fl_value_ref(enum_map);
+  self->object_map = fl_value_ref(object_map);
   return self;
 }
 
@@ -297,6 +303,12 @@ FlValue* core_tests_pigeon_test_all_types_get_enum_list(
   return self->enum_list;
 }
 
+FlValue* core_tests_pigeon_test_all_types_get_object_list(
+    CoreTestsPigeonTestAllTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
+  return self->object_list;
+}
+
 FlValue* core_tests_pigeon_test_all_types_get_list_list(
     CoreTestsPigeonTestAllTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
@@ -327,6 +339,12 @@ FlValue* core_tests_pigeon_test_all_types_get_enum_map(
   return self->enum_map;
 }
 
+FlValue* core_tests_pigeon_test_all_types_get_object_map(
+    CoreTestsPigeonTestAllTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
+  return self->object_map;
+}
+
 static FlValue* core_tests_pigeon_test_all_types_to_list(
     CoreTestsPigeonTestAllTypes* self) {
   FlValue* values = fl_value_new_list();
@@ -360,11 +378,13 @@ static FlValue* core_tests_pigeon_test_all_types_to_list(
   fl_value_append_take(values, fl_value_ref(self->double_list));
   fl_value_append_take(values, fl_value_ref(self->bool_list));
   fl_value_append_take(values, fl_value_ref(self->enum_list));
+  fl_value_append_take(values, fl_value_ref(self->object_list));
   fl_value_append_take(values, fl_value_ref(self->list_list));
   fl_value_append_take(values, fl_value_ref(self->map));
   fl_value_append_take(values, fl_value_ref(self->string_map));
   fl_value_append_take(values, fl_value_ref(self->int_map));
   fl_value_append_take(values, fl_value_ref(self->enum_map));
+  fl_value_append_take(values, fl_value_ref(self->object_map));
   return values;
 }
 
@@ -416,21 +436,25 @@ core_tests_pigeon_test_all_types_new_from_list(FlValue* values) {
   FlValue* value17 = fl_value_get_list_value(values, 17);
   FlValue* enum_list = value17;
   FlValue* value18 = fl_value_get_list_value(values, 18);
-  FlValue* list_list = value18;
+  FlValue* object_list = value18;
   FlValue* value19 = fl_value_get_list_value(values, 19);
-  FlValue* map = value19;
+  FlValue* list_list = value19;
   FlValue* value20 = fl_value_get_list_value(values, 20);
-  FlValue* string_map = value20;
+  FlValue* map = value20;
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* int_map = value21;
+  FlValue* string_map = value21;
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* enum_map = value22;
+  FlValue* int_map = value22;
+  FlValue* value23 = fl_value_get_list_value(values, 23);
+  FlValue* enum_map = value23;
+  FlValue* value24 = fl_value_get_list_value(values, 24);
+  FlValue* object_map = value24;
   return core_tests_pigeon_test_all_types_new(
       a_bool, an_int, an_int64, a_double, a_byte_array, a_byte_array_length,
       a4_byte_array, a4_byte_array_length, a8_byte_array, a8_byte_array_length,
       a_float_array, a_float_array_length, an_enum, another_enum, a_string,
       an_object, list, string_list, int_list, double_list, bool_list, enum_list,
-      list_list, map, string_map, int_map, enum_map);
+      object_list, list_list, map, string_map, int_map, enum_map, object_map);
 }
 
 struct _CoreTestsPigeonTestAllNullableTypes {
@@ -459,12 +483,14 @@ struct _CoreTestsPigeonTestAllNullableTypes {
   FlValue* double_list;
   FlValue* bool_list;
   FlValue* enum_list;
+  FlValue* object_list;
   FlValue* list_list;
   FlValue* recursive_class_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
+  FlValue* object_map;
   FlValue* recursive_class_map;
 };
 
@@ -489,12 +515,14 @@ static void core_tests_pigeon_test_all_nullable_types_dispose(GObject* object) {
   g_clear_pointer(&self->double_list, fl_value_unref);
   g_clear_pointer(&self->bool_list, fl_value_unref);
   g_clear_pointer(&self->enum_list, fl_value_unref);
+  g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
   g_clear_pointer(&self->recursive_class_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
+  g_clear_pointer(&self->object_map, fl_value_unref);
   g_clear_pointer(&self->recursive_class_map, fl_value_unref);
   G_OBJECT_CLASS(core_tests_pigeon_test_all_nullable_types_parent_class)
       ->dispose(object);
@@ -522,9 +550,10 @@ core_tests_pigeon_test_all_nullable_types_new(
     const gchar* a_nullable_string, FlValue* a_nullable_object,
     CoreTestsPigeonTestAllNullableTypes* all_nullable_types, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
-    FlValue* bool_list, FlValue* enum_list, FlValue* list_list,
-    FlValue* recursive_class_list, FlValue* map, FlValue* string_map,
-    FlValue* int_map, FlValue* enum_map, FlValue* recursive_class_map) {
+    FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
+    FlValue* list_list, FlValue* recursive_class_list, FlValue* map,
+    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* recursive_class_map) {
   CoreTestsPigeonTestAllNullableTypes* self =
       CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(g_object_new(
           core_tests_pigeon_test_all_nullable_types_get_type(), nullptr));
@@ -651,6 +680,11 @@ core_tests_pigeon_test_all_nullable_types_new(
   } else {
     self->enum_list = nullptr;
   }
+  if (object_list != nullptr) {
+    self->object_list = fl_value_ref(object_list);
+  } else {
+    self->object_list = nullptr;
+  }
   if (list_list != nullptr) {
     self->list_list = fl_value_ref(list_list);
   } else {
@@ -681,6 +715,11 @@ core_tests_pigeon_test_all_nullable_types_new(
   } else {
     self->enum_map = nullptr;
   }
+  if (object_map != nullptr) {
+    self->object_map = fl_value_ref(object_map);
+  } else {
+    self->object_map = nullptr;
+  }
   if (recursive_class_map != nullptr) {
     self->recursive_class_map = fl_value_ref(recursive_class_map);
   } else {
@@ -833,6 +872,13 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_enum_list(
   return self->enum_list;
 }
 
+FlValue* core_tests_pigeon_test_all_nullable_types_get_object_list(
+    CoreTestsPigeonTestAllNullableTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
+                       nullptr);
+  return self->object_list;
+}
+
 FlValue* core_tests_pigeon_test_all_nullable_types_get_list_list(
     CoreTestsPigeonTestAllNullableTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
@@ -875,6 +921,13 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_enum_map(
   return self->enum_map;
 }
 
+FlValue* core_tests_pigeon_test_all_nullable_types_get_object_map(
+    CoreTestsPigeonTestAllNullableTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
+                       nullptr);
+  return self->object_map;
+}
+
 FlValue* core_tests_pigeon_test_all_nullable_types_get_recursive_class_map(
     CoreTestsPigeonTestAllNullableTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
@@ -959,6 +1012,9 @@ static FlValue* core_tests_pigeon_test_all_nullable_types_to_list(
   fl_value_append_take(values, self->enum_list != nullptr
                                    ? fl_value_ref(self->enum_list)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->object_list != nullptr
+                                   ? fl_value_ref(self->object_list)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->list_list != nullptr
                                    ? fl_value_ref(self->list_list)
                                    : fl_value_new_null());
@@ -976,6 +1032,9 @@ static FlValue* core_tests_pigeon_test_all_nullable_types_to_list(
   fl_value_append_take(values, self->enum_map != nullptr
                                    ? fl_value_ref(self->enum_map)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->object_map != nullptr
+                                   ? fl_value_ref(self->object_map)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->recursive_class_map != nullptr
                                    ? fl_value_ref(self->recursive_class_map)
                                    : fl_value_new_null());
@@ -1105,39 +1164,49 @@ core_tests_pigeon_test_all_nullable_types_new_from_list(FlValue* values) {
     enum_list = value18;
   }
   FlValue* value19 = fl_value_get_list_value(values, 19);
-  FlValue* list_list = nullptr;
+  FlValue* object_list = nullptr;
   if (fl_value_get_type(value19) != FL_VALUE_TYPE_NULL) {
-    list_list = value19;
+    object_list = value19;
   }
   FlValue* value20 = fl_value_get_list_value(values, 20);
-  FlValue* recursive_class_list = nullptr;
+  FlValue* list_list = nullptr;
   if (fl_value_get_type(value20) != FL_VALUE_TYPE_NULL) {
-    recursive_class_list = value20;
+    list_list = value20;
   }
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* map = nullptr;
+  FlValue* recursive_class_list = nullptr;
   if (fl_value_get_type(value21) != FL_VALUE_TYPE_NULL) {
-    map = value21;
+    recursive_class_list = value21;
   }
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* string_map = nullptr;
+  FlValue* map = nullptr;
   if (fl_value_get_type(value22) != FL_VALUE_TYPE_NULL) {
-    string_map = value22;
+    map = value22;
   }
   FlValue* value23 = fl_value_get_list_value(values, 23);
-  FlValue* int_map = nullptr;
+  FlValue* string_map = nullptr;
   if (fl_value_get_type(value23) != FL_VALUE_TYPE_NULL) {
-    int_map = value23;
+    string_map = value23;
   }
   FlValue* value24 = fl_value_get_list_value(values, 24);
-  FlValue* enum_map = nullptr;
+  FlValue* int_map = nullptr;
   if (fl_value_get_type(value24) != FL_VALUE_TYPE_NULL) {
-    enum_map = value24;
+    int_map = value24;
   }
   FlValue* value25 = fl_value_get_list_value(values, 25);
-  FlValue* recursive_class_map = nullptr;
+  FlValue* enum_map = nullptr;
   if (fl_value_get_type(value25) != FL_VALUE_TYPE_NULL) {
-    recursive_class_map = value25;
+    enum_map = value25;
+  }
+  FlValue* value26 = fl_value_get_list_value(values, 26);
+  FlValue* object_map = nullptr;
+  if (fl_value_get_type(value26) != FL_VALUE_TYPE_NULL) {
+    object_map = value26;
+  }
+  FlValue* value27 = fl_value_get_list_value(values, 27);
+  FlValue* recursive_class_map = nullptr;
+  if (fl_value_get_type(value27) != FL_VALUE_TYPE_NULL) {
+    recursive_class_map = value27;
   }
   return core_tests_pigeon_test_all_nullable_types_new(
       a_nullable_bool, a_nullable_int, a_nullable_int64, a_nullable_double,
@@ -1147,8 +1216,8 @@ core_tests_pigeon_test_all_nullable_types_new_from_list(FlValue* values) {
       a_nullable_float_array, a_nullable_float_array_length, a_nullable_enum,
       another_nullable_enum, a_nullable_string, a_nullable_object,
       all_nullable_types, list, string_list, int_list, double_list, bool_list,
-      enum_list, list_list, recursive_class_list, map, string_map, int_map,
-      enum_map, recursive_class_map);
+      enum_list, object_list, list_list, recursive_class_list, map, string_map,
+      int_map, enum_map, object_map, recursive_class_map);
 }
 
 struct _CoreTestsPigeonTestAllNullableTypesWithoutRecursion {
@@ -1176,11 +1245,13 @@ struct _CoreTestsPigeonTestAllNullableTypesWithoutRecursion {
   FlValue* double_list;
   FlValue* bool_list;
   FlValue* enum_list;
+  FlValue* object_list;
   FlValue* list_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
+  FlValue* object_map;
 };
 
 G_DEFINE_TYPE(CoreTestsPigeonTestAllNullableTypesWithoutRecursion,
@@ -1205,11 +1276,13 @@ static void core_tests_pigeon_test_all_nullable_types_without_recursion_dispose(
   g_clear_pointer(&self->double_list, fl_value_unref);
   g_clear_pointer(&self->bool_list, fl_value_unref);
   g_clear_pointer(&self->enum_list, fl_value_unref);
+  g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
+  g_clear_pointer(&self->object_map, fl_value_unref);
   G_OBJECT_CLASS(
       core_tests_pigeon_test_all_nullable_types_without_recursion_parent_class)
       ->dispose(object);
@@ -1237,8 +1310,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
     CoreTestsPigeonTestAnotherEnum* another_nullable_enum,
     const gchar* a_nullable_string, FlValue* a_nullable_object, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
-    FlValue* bool_list, FlValue* enum_list, FlValue* list_list, FlValue* map,
-    FlValue* string_map, FlValue* int_map, FlValue* enum_map) {
+    FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
+    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
+    FlValue* enum_map, FlValue* object_map) {
   CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self =
       CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(g_object_new(
           core_tests_pigeon_test_all_nullable_types_without_recursion_get_type(),
@@ -1360,6 +1434,11 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
   } else {
     self->enum_list = nullptr;
   }
+  if (object_list != nullptr) {
+    self->object_list = fl_value_ref(object_list);
+  } else {
+    self->object_list = nullptr;
+  }
   if (list_list != nullptr) {
     self->list_list = fl_value_ref(list_list);
   } else {
@@ -1385,6 +1464,11 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
   } else {
     self->enum_map = nullptr;
   }
+  if (object_map != nullptr) {
+    self->object_map = fl_value_ref(object_map);
+  } else {
+    self->object_map = nullptr;
+  }
   return self;
 }
 
@@ -1553,6 +1637,15 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_get_enum_list(
   return self->enum_list;
 }
 
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_list(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(self),
+      nullptr);
+  return self->object_list;
+}
+
 FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_list(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
@@ -1597,6 +1690,15 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_get_enum_map(
   return self->enum_map;
 }
 
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(self),
+      nullptr);
+  return self->object_map;
+}
+
 static FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
@@ -1670,6 +1772,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
   fl_value_append_take(values, self->enum_list != nullptr
                                    ? fl_value_ref(self->enum_list)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->object_list != nullptr
+                                   ? fl_value_ref(self->object_list)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->list_list != nullptr
                                    ? fl_value_ref(self->list_list)
                                    : fl_value_new_null());
@@ -1684,6 +1789,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
   fl_value_append_take(values, self->enum_map != nullptr
                                    ? fl_value_ref(self->enum_map)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->object_map != nullptr
+                                   ? fl_value_ref(self->object_map)
+                                   : fl_value_new_null());
   return values;
 }
 
@@ -1805,29 +1913,39 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new_from_list(
     enum_list = value17;
   }
   FlValue* value18 = fl_value_get_list_value(values, 18);
-  FlValue* list_list = nullptr;
+  FlValue* object_list = nullptr;
   if (fl_value_get_type(value18) != FL_VALUE_TYPE_NULL) {
-    list_list = value18;
+    object_list = value18;
   }
   FlValue* value19 = fl_value_get_list_value(values, 19);
-  FlValue* map = nullptr;
+  FlValue* list_list = nullptr;
   if (fl_value_get_type(value19) != FL_VALUE_TYPE_NULL) {
-    map = value19;
+    list_list = value19;
   }
   FlValue* value20 = fl_value_get_list_value(values, 20);
-  FlValue* string_map = nullptr;
+  FlValue* map = nullptr;
   if (fl_value_get_type(value20) != FL_VALUE_TYPE_NULL) {
-    string_map = value20;
+    map = value20;
   }
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* int_map = nullptr;
+  FlValue* string_map = nullptr;
   if (fl_value_get_type(value21) != FL_VALUE_TYPE_NULL) {
-    int_map = value21;
+    string_map = value21;
   }
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* enum_map = nullptr;
+  FlValue* int_map = nullptr;
   if (fl_value_get_type(value22) != FL_VALUE_TYPE_NULL) {
-    enum_map = value22;
+    int_map = value22;
+  }
+  FlValue* value23 = fl_value_get_list_value(values, 23);
+  FlValue* enum_map = nullptr;
+  if (fl_value_get_type(value23) != FL_VALUE_TYPE_NULL) {
+    enum_map = value23;
+  }
+  FlValue* value24 = fl_value_get_list_value(values, 24);
+  FlValue* object_map = nullptr;
+  if (fl_value_get_type(value24) != FL_VALUE_TYPE_NULL) {
+    object_map = value24;
   }
   return core_tests_pigeon_test_all_nullable_types_without_recursion_new(
       a_nullable_bool, a_nullable_int, a_nullable_int64, a_nullable_double,
@@ -1836,8 +1954,8 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new_from_list(
       a_nullable8_byte_array, a_nullable8_byte_array_length,
       a_nullable_float_array, a_nullable_float_array_length, a_nullable_enum,
       another_nullable_enum, a_nullable_string, a_nullable_object, list,
-      string_list, int_list, double_list, bool_list, enum_list, list_list, map,
-      string_map, int_map, enum_map);
+      string_list, int_list, double_list, bool_list, enum_list, object_list,
+      list_list, map, string_map, int_map, enum_map, object_map);
 }
 
 struct _CoreTestsPigeonTestAllClassesWrapper {
@@ -3398,6 +3516,138 @@ core_tests_pigeon_test_host_integration_core_api_echo_class_list_response_new_er
   return self;
 }
 
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_ref(return_value));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_ref(return_value));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
 struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse {
   GObject parent_instance;
 
@@ -3717,62 +3967,62 @@ core_tests_pigeon_test_host_integration_core_api_echo_class_map_response_new_err
   return self;
 }
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_new(
-    CoreTestsPigeonTestAllClassesWrapper* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom_object(135, G_OBJECT(return_value)));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -3783,61 +4033,62 @@ core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_new
   return self;
 }
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponseClass* klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_enum_response_new(
-    CoreTestsPigeonTestAnEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(g_object_new(
-          core_tests_pigeon_test_host_integration_core_api_echo_enum_response_get_type(),
-          nullptr));
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_get_type(),
+              nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(129, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_enum_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(g_object_new(
-          core_tests_pigeon_test_host_integration_core_api_echo_enum_response_get_type(),
-          nullptr));
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_get_type(),
+              nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
   fl_value_append_take(self->value,
@@ -3847,53 +4098,315 @@ core_tests_pigeon_test_host_integration_core_api_echo_enum_response_new_error(
   return self;
 }
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(130, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_ref(return_value));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_new(
+    CoreTestsPigeonTestAllClassesWrapper* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value,
+                       fl_value_new_custom_object(135, G_OBJECT(return_value)));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_CLASS_WRAPPER_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_enum_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_enum_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_enum_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponseClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_enum_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_enum_response_new(
+    CoreTestsPigeonTestAnEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(g_object_new(
+          core_tests_pigeon_test_host_integration_core_api_echo_enum_response_get_type(),
+          nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value,
+                       fl_value_new_custom(129, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_enum_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(g_object_new(
+          core_tests_pigeon_test_host_integration_core_api_echo_enum_response_get_type(),
+          nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_another_enum_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value,
+                       fl_value_new_custom(130, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
   return self;
 }
 
@@ -5138,43 +5651,183 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_respon
   return self;
 }
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_new(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_dispose;
+}
+
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_new(
     FlValue* return_value) {
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
@@ -5477,66 +6130,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_respons
   return self;
 }
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new(
-    CoreTestsPigeonTestAnEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5548,67 +6201,64 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new
 }
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5620,64 +6270,64 @@ core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_resp
 }
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new(
-    int64_t* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_int(*return_value)
+                                        ? fl_value_ref(return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5689,64 +6339,65 @@ core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_resp
 }
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_dispose;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_string(return_value)
+                                        ? fl_value_ref(return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5757,64 +6408,67 @@ core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_resp
   return self;
 }
 
-G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse,
-    core_tests_pigeon_test_host_integration_core_api_noop_async_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE,
-    GObject)
-
-struct _CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse,
-    core_tests_pigeon_test_host_integration_core_api_noop_async_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_noop_async_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_noop_async_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_noop_async_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self) {}
-
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self) {}
+
 static void
-core_tests_pigeon_test_host_integration_core_api_noop_async_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponseClass* klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_noop_async_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse*
-core_tests_pigeon_test_host_integration_core_api_noop_async_response_new() {
-  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(g_object_new(
-          core_tests_pigeon_test_host_integration_core_api_noop_async_response_get_type(),
-          nullptr));
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new(
+    CoreTestsPigeonTestAnEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_get_type(),
+              nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_null());
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse*
-core_tests_pigeon_test_host_integration_core_api_noop_async_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(g_object_new(
-          core_tests_pigeon_test_host_integration_core_api_noop_async_response_get_type(),
-          nullptr));
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_get_type(),
+              nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
   fl_value_append_take(self->value,
@@ -5824,66 +6478,68 @@ core_tests_pigeon_test_host_integration_core_api_noop_async_response_new_error(
   return self;
 }
 
-G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_int_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE,
-    GObject)
-
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponseClass* klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new(
-    int64_t return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_int(return_value));
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5894,67 +6550,65 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new_err
   return self;
 }
 
-G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_double_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE, GObject)
-
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new(
-    double return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new(
+    int64_t* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_float(return_value));
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_new_int(*return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -5965,67 +6619,65 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new_
   return self;
 }
 
-G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE,
-    GObject)
-
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new(
-    gboolean return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_bool(return_value));
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_new_string(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_NAMED_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6037,67 +6689,63 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new_er
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_string_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE, GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse,
+    core_tests_pigeon_test_host_integration_core_api_noop_async_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse,
+    core_tests_pigeon_test_host_integration_core_api_noop_async_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_noop_async_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_noop_async_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_noop_async_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponseClass*
-        klass) {
+core_tests_pigeon_test_host_integration_core_api_noop_async_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_noop_async_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
-          g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_get_type(),
-              nullptr));
+static CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse*
+core_tests_pigeon_test_host_integration_core_api_noop_async_response_new() {
+  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(g_object_new(
+          core_tests_pigeon_test_host_integration_core_api_noop_async_response_get_type(),
+          nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_string(return_value));
+  fl_value_append_take(self->value, fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse*
+core_tests_pigeon_test_host_integration_core_api_noop_async_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
-          g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_get_type(),
-              nullptr));
+  CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_NOOP_ASYNC_RESPONSE(g_object_new(
+          core_tests_pigeon_test_host_integration_core_api_noop_async_response_get_type(),
+          nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
   fl_value_append_take(self->value,
@@ -6108,68 +6756,65 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE, GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_int_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self) {
-}
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponseClass*
-        klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new(
-    const uint8_t* return_value, size_t return_value_length) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new(
+    int64_t return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, fl_value_new_uint8_list(return_value, return_value_length));
+  fl_value_append_take(self->value, fl_value_new_int(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6181,66 +6826,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_object_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_double_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_object_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_double_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new(
+    double return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_float(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6252,66 +6897,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_list_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE,
     GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new(
+    gboolean return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_bool(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6323,66 +6968,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new_er
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_string_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_string(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6394,67 +7039,68 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_n
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self) {
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self) {
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new(
+    const uint8_t* return_value, size_t return_value_length) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(
+      self->value, fl_value_new_uint8_list(return_value, return_value_length));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6466,65 +7112,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_map_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE,
-    GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_object_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_object_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponseClass* klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_OBJECT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6536,67 +7183,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new_err
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE, GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_list_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self) {
-}
+core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6608,66 +7254,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6679,66 +7325,67 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6750,66 +7397,65 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_ne
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE, GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_map_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponseClass*
-        klass) {
+core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6821,68 +7467,67 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_n
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response,
-    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE,
-    GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new(
-    CoreTestsPigeonTestAnEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(129, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6894,69 +7539,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new_er
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(130, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -6968,68 +7610,66 @@ core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_respons
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_error_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_error_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7041,67 +7681,66 @@ core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new() {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7113,70 +7752,68 @@ core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_res
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response,
-    CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE, GObject)
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response,
+    CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE,
+    GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new(
+    CoreTestsPigeonTestAnEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value,
+                       fl_value_new_custom(129, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7188,67 +7825,69 @@ core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_respo
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new(
-    CoreTestsPigeonTestAllTypes* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value,
-                       fl_value_new_custom_object(132, G_OBJECT(return_value)));
+                       fl_value_new_custom(130, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7260,73 +7899,68 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_n
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_error_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_error_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponseClass*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new(
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, return_value != nullptr
-                       ? fl_value_new_custom_object(133, G_OBJECT(return_value))
-                       : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7338,73 +7972,67 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullabl
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponseClass*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new(
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new() {
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, return_value != nullptr
-                       ? fl_value_new_custom_object(134, G_OBJECT(return_value))
-                       : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_ERROR_FROM_VOID_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7416,69 +8044,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullabl
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponseClass*
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new(
-    int64_t* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_int(*return_value)
+                                        ? fl_value_ref(return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_THROW_ASYNC_FLUTTER_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7490,70 +8119,67 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_respons
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new(
-    double* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new(
+    CoreTestsPigeonTestAllTypes* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_float(*return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value,
+                       fl_value_new_custom_object(132, G_OBJECT(return_value)));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_ALL_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7565,69 +8191,73 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_resp
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new(
-    gboolean* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new(
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_bool(*return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(
+      self->value, return_value != nullptr
+                       ? fl_value_new_custom_object(133, G_OBJECT(return_value))
+                       : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7639,70 +8269,73 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
+    GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_string(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(
+      self->value, return_value != nullptr
+                       ? fl_value_new_custom_object(134, G_OBJECT(return_value))
+                       : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7714,71 +8347,69 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_resp
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new(
-    const uint8_t* return_value, size_t return_value_length) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new(
+    int64_t* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_uint8_list(
-                                              return_value, return_value_length)
+                                        ? fl_value_new_int(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7790,70 +8421,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new(
+    double* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_float(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7865,69 +8496,69 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_resp
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new(
+    gboolean* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_bool(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -7939,70 +8570,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_string(return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8014,70 +8645,71 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_r
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new(
+    const uint8_t* return_value, size_t return_value_length) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_uint8_list(
+                                              return_value, return_value_length)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8089,54 +8721,55 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8145,13 +8778,13 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_respons
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_OBJECT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8163,55 +8796,54 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_respons
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8220,13 +8852,13 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8238,55 +8870,55 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8295,13 +8927,13 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_res
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8313,55 +8945,55 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_res
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8370,13 +9002,13 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_re
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8388,55 +9020,54 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_re
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8445,13 +9076,13 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_r
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new_error(
-    const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8463,72 +9094,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_r
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new(
-    CoreTestsPigeonTestAnEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8540,75 +9169,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8620,65 +9244,70 @@ core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enu
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self) {}
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new() {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8690,54 +9319,55 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
@@ -8746,13 +9376,13 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_respon
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8764,69 +9394,72 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new() {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new(
+    CoreTestsPigeonTestAnEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_null());
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ASYNC_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8838,69 +9471,75 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_v
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE,
+    GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponseClass*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new(
-    CoreTestsPigeonTestAllTypes* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom_object(132, G_OBJECT(return_value)));
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_ASYNC_NULLABLE_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8912,73 +9551,65 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_res
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new(
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new() {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, return_value != nullptr
-                       ? fl_value_new_custom_object(133, G_OBJECT(return_value))
-                       : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_NOOP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -8990,71 +9621,69 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new(
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom_object(133, G_OBJECT(return_value)));
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9066,73 +9695,69 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_null
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new(
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new() {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, return_value != nullptr
-                       ? fl_value_new_custom_object(134, G_OBJECT(return_value))
-                       : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_THROW_ERROR_FROM_VOID_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9144,71 +9769,69 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new(
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new(
+    CoreTestsPigeonTestAllTypes* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value,
-                       fl_value_new_custom_object(134, G_OBJECT(return_value)));
+                       fl_value_new_custom_object(132, G_OBJECT(return_value)));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9220,67 +9843,73 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_null
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new(
-    gboolean return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new(
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_bool(return_value));
+  fl_value_append_take(
+      self->value, return_value != nullptr
+                       ? fl_value_new_custom_object(133, G_OBJECT(return_value))
+                       : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9292,67 +9921,71 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self) {
-}
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new(
-    int64_t return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new(
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_int(return_value));
+  fl_value_append_take(self->value,
+                       fl_value_new_custom_object(133, G_OBJECT(return_value)));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9364,67 +9997,73 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new(
-    double return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_float(return_value));
+  fl_value_append_take(
+      self->value, return_value != nullptr
+                       ? fl_value_new_custom_object(134, G_OBJECT(return_value))
+                       : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9436,67 +10075,71 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_string(return_value));
+  fl_value_append_take(self->value,
+                       fl_value_new_custom_object(134, G_OBJECT(return_value)));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9508,69 +10151,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_respon
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new(
-    const uint8_t* return_value, size_t return_value_length) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new(
+    gboolean return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value, fl_value_new_uint8_list(return_value, return_value_length));
+  fl_value_append_take(self->value, fl_value_new_bool(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9582,67 +10223,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_re
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new(
+    int64_t return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_int(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9654,68 +10295,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new(
+    double return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_float(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9727,68 +10367,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_res
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(self->value, fl_value_new_string(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9800,67 +10439,69 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_re
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self) {
-}
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new(
+    const uint8_t* return_value, size_t return_value_length) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_ref(return_value));
+  fl_value_append_take(
+      self->value, fl_value_new_uint8_list(return_value, return_value_length));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9872,68 +10513,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -9945,67 +10585,68 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_re
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE, GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10017,68 +10658,68 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_respo
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new_error(
-    const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10090,68 +10731,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_resp
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_LIST_RESPONSE,
+    GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10163,69 +10806,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_res
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_LIST_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
-          object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
+              object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new(
-    CoreTestsPigeonTestAnEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(129, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10237,70 +10881,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
-        self) {}
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value,
-                       fl_value_new_custom(130, fl_value_new_int(return_value),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10312,71 +10953,68 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new(
-    gboolean* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_bool(*return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10388,70 +11026,67 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new(
-    int64_t* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_int(*return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10463,72 +11098,68 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new(
-    double* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_float(*return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10540,72 +11171,68 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_doub
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_string(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10617,73 +11244,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_stri
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_STRING_MAP_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_STRING_MAP_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new(
-    const uint8_t* return_value, size_t return_value_length) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_new_uint8_list(
-                                              return_value, return_value_length)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10695,71 +11319,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_INT_MAP_RESPONSE,
+    GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_INT_MAP_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10771,72 +11394,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_MAP_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10848,72 +11469,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_MAP_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_new(
     FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value, fl_value_ref(return_value));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -10925,70 +11544,69 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_clas
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE, GObject)
 
-struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse {
+struct _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new(
+    CoreTestsPigeonTestAnEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value,
+                       fl_value_new_custom(129, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11000,72 +11618,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
-                                        : fl_value_new_null());
+  fl_value_append_take(self->value,
+                       fl_value_new_custom(130, fl_value_new_int(return_value),
+                                           (GDestroyNotify)fl_value_unref));
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11077,72 +11693,71 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_stri
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new(
+    gboolean* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_bool(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11154,72 +11769,70 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
-              object);
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
+          object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new(
+    int64_t* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_int(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11231,72 +11844,72 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new(
-    FlValue* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new(
+    double* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, return_value != nullptr
-                                        ? fl_value_ref(return_value)
+                                        ? fl_value_new_float(*return_value)
                                         : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11308,74 +11921,72 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_clas
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE,
+    GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new(
-    CoreTestsPigeonTestAnEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_new_string(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11387,75 +11998,73 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE,
     GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new(
+    const uint8_t* return_value, size_t return_value_length) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(
-      self->value,
-      return_value != nullptr
-          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
-                                (GDestroyNotify)fl_value_unref)
-          : fl_value_new_null());
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_new_uint8_list(
+                                              return_value, return_value_length)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
-      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11467,70 +12076,71 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nulla
 }
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE,
-    GObject)
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE, GObject)
 
 struct
-    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse {
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse {
   GObject parent_instance;
 
   FlValue* value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse,
-    core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_dispose(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
       self =
-          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
               object);
   g_clear_pointer(&self->value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_parent_class)
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponseClass*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new(
-    const gchar* return_value) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
-  fl_value_append_take(self->value, fl_value_new_string(return_value));
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
   return self;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new_error(
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details) {
-  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_get_type(),
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_get_type(),
               nullptr));
   self->value = fl_value_new_list();
   fl_value_append_take(self->value, fl_value_new_string(code));
@@ -11541,1022 +12151,1304 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_str
   return self;
 }
 
-G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestHostIntegrationCoreApi,
-                     core_tests_pigeon_test_host_integration_core_api,
-                     CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API, GObject)
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE,
+    GObject)
 
-struct _CoreTestsPigeonTestHostIntegrationCoreApi {
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse {
   GObject parent_instance;
 
-  const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable;
-  gpointer user_data;
-  GDestroyNotify user_data_free_func;
+  FlValue* value;
 };
 
-G_DEFINE_TYPE(CoreTestsPigeonTestHostIntegrationCoreApi,
-              core_tests_pigeon_test_host_integration_core_api, G_TYPE_OBJECT)
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response,
+    G_TYPE_OBJECT)
 
-static void core_tests_pigeon_test_host_integration_core_api_dispose(
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(object);
-  if (self->user_data != nullptr) {
-    self->user_data_free_func(self->user_data);
-  }
-  self->user_data = nullptr;
-  G_OBJECT_CLASS(core_tests_pigeon_test_host_integration_core_api_parent_class)
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_parent_class)
       ->dispose(object);
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_init(
-    CoreTestsPigeonTestHostIntegrationCoreApi* self) {}
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+        self) {}
 
-static void core_tests_pigeon_test_host_integration_core_api_class_init(
-    CoreTestsPigeonTestHostIntegrationCoreApiClass* klass) {
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_host_integration_core_api_dispose;
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestHostIntegrationCoreApi*
-core_tests_pigeon_test_host_integration_core_api_new(
-    const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable,
-    gpointer user_data, GDestroyNotify user_data_free_func) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(g_object_new(
-          core_tests_pigeon_test_host_integration_core_api_get_type(),
-          nullptr));
-  self->vtable = vtable;
-  self->user_data = user_data;
-  self->user_data_free_func = user_data_free_func;
-  return self;
-}
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-static void core_tests_pigeon_test_host_integration_core_api_noop_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
 
-  if (self->vtable == nullptr || self->vtable->noop == nullptr) {
-    return;
-  }
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE,
+    GObject)
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiNoopResponse) response =
-      self->vtable->noop(self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "noop");
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse {
+  GObject parent_instance;
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "noop", error->message);
-  }
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_parent_class)
+      ->dispose(object);
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_all_types_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+        self) {}
 
-  if (self->vtable == nullptr || self->vtable->echo_all_types == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
-      fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAllTypesResponse)
-      response = self->vtable->echo_all_types(everything, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoAllTypes");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAllTypes", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_throw_error_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->throw_error == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse {
+  GObject parent_instance;
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowErrorResponse)
-      response = self->vtable->throw_error(self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "throwError");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwError", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_error_from_void_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+        self) {}
 
-  if (self->vtable == nullptr ||
-      self->vtable->throw_error_from_void == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_dispose;
+}
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowErrorFromVoidResponse)
-      response = self->vtable->throw_error_from_void(self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "throwErrorFromVoid");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwErrorFromVoid", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_throw_flutter_error_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->throw_flutter_error == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse {
+  GObject parent_instance;
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowFlutterErrorResponse)
-      response = self->vtable->throw_flutter_error(self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "throwFlutterError");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwFlutterError", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_parent_class)
+      ->dispose(object);
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_int_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+        self) {}
 
-  if (self->vtable == nullptr || self->vtable->echo_int == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t an_int = fl_value_get_int(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoIntResponse) response =
-      self->vtable->echo_int(an_int, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoInt");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoInt", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_double_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE, GObject)
 
-  if (self->vtable == nullptr || self->vtable->echo_double == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double a_double = fl_value_get_float(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoDoubleResponse)
-      response = self->vtable->echo_double(a_double, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoDouble");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoDouble", error->message);
-  }
-}
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response,
+    G_TYPE_OBJECT)
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_bool_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+          object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_parent_class)
+      ->dispose(object);
+}
 
-  if (self->vtable == nullptr || self->vtable->echo_bool == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
+        self) {}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean a_bool = fl_value_get_bool(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoBoolResponse)
-      response = self->vtable->echo_bool(a_bool, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoBool");
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_dispose;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoBool", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_string_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
 
-  if (self->vtable == nullptr || self->vtable->echo_string == nullptr) {
-    return;
-  }
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE,
+    GObject)
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoStringResponse)
-      response = self->vtable->echo_string(a_string, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoString");
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse {
+  GObject parent_instance;
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoString", error->message);
-  }
-}
+  FlValue* value;
+};
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_uint8_list_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response,
+    G_TYPE_OBJECT)
 
-  if (self->vtable == nullptr || self->vtable->echo_uint8_list == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_parent_class)
+      ->dispose(object);
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
-  size_t a_uint8_list_length = fl_value_get_length(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoUint8ListResponse)
-      response = self->vtable->echo_uint8_list(
-          a_uint8_list, a_uint8_list_length, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoUint8List");
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+        self) {}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoUint8List", error->message);
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_dispose;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_object_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
-
-  if (self->vtable == nullptr || self->vtable->echo_object == nullptr) {
-    return;
-  }
-
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* an_object = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoObjectResponse)
-      response = self->vtable->echo_object(an_object, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoObject");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoObject", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_list_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->echo_list == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoListResponse)
-      response = self->vtable->echo_list(list, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoList");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoList", error->message);
-  }
-}
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response,
+    G_TYPE_OBJECT)
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_enum_list_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_parent_class)
+      ->dispose(object);
+}
 
-  if (self->vtable == nullptr || self->vtable->echo_enum_list == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+        self) {}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumListResponse)
-      response = self->vtable->echo_enum_list(enum_list, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoEnumList");
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_dispose;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoEnumList", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_class_list_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
 
-  if (self->vtable == nullptr || self->vtable->echo_class_list == nullptr) {
-    return;
-  }
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE,
+    GObject)
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassListResponse)
-      response = self->vtable->echo_class_list(class_list, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoClassList");
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse {
+  GObject parent_instance;
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoClassList", error->message);
-  }
-}
+  FlValue* value;
+};
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_map_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response,
+    G_TYPE_OBJECT)
 
-  if (self->vtable == nullptr || self->vtable->echo_map == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_parent_class)
+      ->dispose(object);
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse) response =
-      self->vtable->echo_map(map, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoMap");
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+        self) {}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoMap", error->message);
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_dispose;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_string_map_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
-
-  if (self->vtable == nullptr || self->vtable->echo_string_map == nullptr) {
-    return;
-  }
-
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* string_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoStringMapResponse)
-      response = self->vtable->echo_string_map(string_map, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoStringMap");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoStringMap", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_int_map_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->echo_int_map == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* int_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoIntMapResponse)
-      response = self->vtable->echo_int_map(int_map, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoIntMap");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoIntMap", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_parent_class)
+      ->dispose(object);
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_enum_map_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+        self) {}
 
-  if (self->vtable == nullptr || self->vtable->echo_enum_map == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumMapResponse)
-      response = self->vtable->echo_enum_map(enum_map, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoEnumMap");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoEnumMap", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_class_map_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->echo_class_map == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassMapResponse)
-      response = self->vtable->echo_class_map(class_map, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoClassMap");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoClassMap", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+        self) {}
 
-  if (self->vtable == nullptr || self->vtable->echo_class_wrapper == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllClassesWrapper* wrapper =
-      CORE_TESTS_PIGEON_TEST_ALL_CLASSES_WRAPPER(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse)
-      response = self->vtable->echo_class_wrapper(wrapper, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoClassWrapper");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoClassWrapper", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_enum_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr || self->vtable->echo_enum == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnEnum an_enum = static_cast<CoreTestsPigeonTestAnEnum>(
-      fl_value_get_int(reinterpret_cast<FlValue*>(
-          const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse)
-      response = self->vtable->echo_enum(an_enum, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoEnum");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoEnum", error->message);
-  }
-}
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response,
+    G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_enum_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
-
-  if (self->vtable == nullptr || self->vtable->echo_another_enum == nullptr) {
-    return;
-  }
-
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnotherEnum another_enum =
-      static_cast<CoreTestsPigeonTestAnotherEnum>(
-          fl_value_get_int(reinterpret_cast<FlValue*>(
-              const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse)
-      response = self->vtable->echo_another_enum(another_enum, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoAnotherEnum");
-    return;
-  }
-
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherEnum", error->message);
-  }
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_named_default_string_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+        self) {}
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_named_default_string == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedDefaultStringResponse)
-      response =
-          self->vtable->echo_named_default_string(a_string, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNamedDefaultString");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNamedDefaultString", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_optional_default_double_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_optional_default_double == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double a_double = fl_value_get_float(value0);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalDefaultDoubleResponse)
-      response =
-          self->vtable->echo_optional_default_double(a_double, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoOptionalDefaultDouble");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoOptionalDefaultDouble", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_required_int_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+        self) {}
 
-  if (self->vtable == nullptr || self->vtable->echo_required_int == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t an_int = fl_value_get_int(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoRequiredIntResponse)
-      response = self->vtable->echo_required_int(an_int, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoRequiredInt");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoRequiredInt", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_all_nullable_types_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_all_nullable_types == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypes* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAllNullableTypesResponse)
-      response =
-          self->vtable->echo_all_nullable_types(everything, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoAllNullableTypes");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAllNullableTypes", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_all_nullable_types_without_recursion_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+        self) {}
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_all_nullable_types_without_recursion == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse)
-      response = self->vtable->echo_all_nullable_types_without_recursion(
-          everything, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoAllNullableTypesWithoutRecursion");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_new(
+    FlValue* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, return_value != nullptr
+                                        ? fl_value_ref(return_value)
+                                        : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAllNullableTypesWithoutRecursion", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_extract_nested_nullable_string_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE, GObject)
 
-  if (self->vtable == nullptr ||
-      self->vtable->extract_nested_nullable_string == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllClassesWrapper* wrapper =
-      CORE_TESTS_PIGEON_TEST_ALL_CLASSES_WRAPPER(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiExtractNestedNullableStringResponse)
-      response = self->vtable->extract_nested_nullable_string(wrapper,
-                                                              self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "extractNestedNullableString");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "extractNestedNullableString", error->message);
-  }
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_parent_class)
+      ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_create_nested_nullable_string_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+        self) {}
 
-  if (self->vtable == nullptr ||
-      self->vtable->create_nested_nullable_string == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_dispose;
+}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* nullable_string = fl_value_get_string(value0);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCreateNestedNullableStringResponse)
-      response = self->vtable->create_nested_nullable_string(nullable_string,
-                                                             self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "createNestedNullableString");
-    return;
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new(
+    CoreTestsPigeonTestAnEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(129, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
+  return self;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "createNestedNullableString", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE,
+    GObject)
 
-  if (self->vtable == nullptr ||
-      self->vtable->send_multiple_nullable_types == nullptr) {
-    return;
-  }
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse {
+  GObject parent_instance;
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_nullable_bool = nullptr;
-  gboolean a_nullable_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_bool_value = fl_value_get_bool(value0);
-    a_nullable_bool = &a_nullable_bool_value;
-  }
-  FlValue* value1 = fl_value_get_list_value(message_, 1);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value1);
-    a_nullable_int = &a_nullable_int_value;
-  }
-  FlValue* value2 = fl_value_get_list_value(message_, 2);
-  const gchar* a_nullable_string = fl_value_get_string(value2);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiSendMultipleNullableTypesResponse)
-      response = self->vtable->send_multiple_nullable_types(
-          a_nullable_bool, a_nullable_int, a_nullable_string, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "sendMultipleNullableTypes");
-    return;
-  }
+  FlValue* value;
+};
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "sendMultipleNullableTypes", error->message);
-  }
-}
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response,
+    G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_without_recursion_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_parent_class)
+      ->dispose(object);
+}
 
-  if (self->vtable == nullptr ||
-      self->vtable->send_multiple_nullable_types_without_recursion == nullptr) {
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+        self) {}
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_nullable_bool = nullptr;
-  gboolean a_nullable_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_bool_value = fl_value_get_bool(value0);
-    a_nullable_bool = &a_nullable_bool_value;
-  }
-  FlValue* value1 = fl_value_get_list_value(message_, 1);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value1);
-    a_nullable_int = &a_nullable_int_value;
-  }
-  FlValue* value2 = fl_value_get_list_value(message_, 2);
-  const gchar* a_nullable_string = fl_value_get_string(value2);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse)
-      response = self->vtable->send_multiple_nullable_types_without_recursion(
-          a_nullable_bool, a_nullable_int, a_nullable_string, self->user_data);
-  if (response == nullptr) {
-    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "sendMultipleNullableTypesWithoutRecursion");
-    return;
-  }
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_dispose;
+}
 
-  g_autoptr(GError) error = NULL;
-  if (!fl_basic_message_channel_respond(channel, response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "sendMultipleNullableTypesWithoutRecursion", error->message);
-  }
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(
+      self->value,
+      return_value != nullptr
+          ? fl_value_new_custom(130, fl_value_new_int(*return_value),
+                                (GDestroyNotify)fl_value_unref)
+          : fl_value_new_null());
+  return self;
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse*
+      self = CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
 }
 
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE,
+    GObject)
+
+struct
+    _CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse {
+  GObject parent_instance;
+
+  FlValue* value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse,
+    core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response,
+    G_TYPE_OBJECT)
+
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_cb(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+              object);
+  g_clear_pointer(&self->value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_dispose;
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new(
+    const gchar* return_value) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(return_value));
+  return self;
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse*
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details) {
+  CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API_CALL_FLUTTER_SMALL_API_ECHO_STRING_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_get_type(),
+              nullptr));
+  self->value = fl_value_new_list();
+  fl_value_append_take(self->value, fl_value_new_string(code));
+  fl_value_append_take(self->value,
+                       fl_value_new_string(message != nullptr ? message : ""));
+  fl_value_append_take(self->value, details != nullptr ? fl_value_ref(details)
+                                                       : fl_value_new_null());
+  return self;
+}
+
+G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestHostIntegrationCoreApi,
+                     core_tests_pigeon_test_host_integration_core_api,
+                     CORE_TESTS_PIGEON_TEST, HOST_INTEGRATION_CORE_API, GObject)
+
+struct _CoreTestsPigeonTestHostIntegrationCoreApi {
+  GObject parent_instance;
+
+  const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable;
+  gpointer user_data;
+  GDestroyNotify user_data_free_func;
+};
+
+G_DEFINE_TYPE(CoreTestsPigeonTestHostIntegrationCoreApi,
+              core_tests_pigeon_test_host_integration_core_api, G_TYPE_OBJECT)
+
+static void core_tests_pigeon_test_host_integration_core_api_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(object);
+  if (self->user_data != nullptr) {
+    self->user_data_free_func(self->user_data);
+  }
+  self->user_data = nullptr;
+  G_OBJECT_CLASS(core_tests_pigeon_test_host_integration_core_api_parent_class)
+      ->dispose(object);
+}
+
+static void core_tests_pigeon_test_host_integration_core_api_init(
+    CoreTestsPigeonTestHostIntegrationCoreApi* self) {}
+
+static void core_tests_pigeon_test_host_integration_core_api_class_init(
+    CoreTestsPigeonTestHostIntegrationCoreApiClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_host_integration_core_api_dispose;
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApi*
+core_tests_pigeon_test_host_integration_core_api_new(
+    const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable,
+    gpointer user_data, GDestroyNotify user_data_free_func) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(g_object_new(
+          core_tests_pigeon_test_host_integration_core_api_get_type(),
+          nullptr));
+  self->vtable = vtable;
+  self->user_data = user_data;
+  self->user_data_free_func = user_data_free_func;
+  return self;
+}
+
+static void core_tests_pigeon_test_host_integration_core_api_noop_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_nullable_int == nullptr) {
+  if (self->vtable == nullptr || self->vtable->noop == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value0);
-    a_nullable_int = &a_nullable_int_value;
-  }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableIntResponse)
-      response =
-          self->vtable->echo_nullable_int(a_nullable_int, self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiNoopResponse) response =
+      self->vtable->noop(self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableInt");
+              "noop");
     return;
   }
 
@@ -12564,35 +13456,28 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableInt", error->message);
+              "noop", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_double_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_all_types_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_double == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_all_types == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double* a_nullable_double = nullptr;
-  double a_nullable_double_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_double_value = fl_value_get_float(value0);
-    a_nullable_double = &a_nullable_double_value;
-  }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableDoubleResponse)
-      response = self->vtable->echo_nullable_double(a_nullable_double,
-                                                    self->user_data);
+  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
+      fl_value_get_custom_value_object(value0));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAllTypesResponse)
+      response = self->vtable->echo_all_types(everything, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableDouble");
+              "echoAllTypes");
     return;
   }
 
@@ -12600,34 +13485,25 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_double_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableDouble", error->message);
+              "echoAllTypes", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_bool_cb(
+static void core_tests_pigeon_test_host_integration_core_api_throw_error_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_nullable_bool == nullptr) {
+  if (self->vtable == nullptr || self->vtable->throw_error == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_nullable_bool = nullptr;
-  gboolean a_nullable_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_bool_value = fl_value_get_bool(value0);
-    a_nullable_bool = &a_nullable_bool_value;
-  }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableBoolResponse)
-      response =
-          self->vtable->echo_nullable_bool(a_nullable_bool, self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowErrorResponse)
+      response = self->vtable->throw_error(self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableBool");
+              "throwError");
     return;
   }
 
@@ -12635,30 +13511,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_bool_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableBool", error->message);
+              "throwError", error->message);
   }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_cb(
+core_tests_pigeon_test_host_integration_core_api_throw_error_from_void_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_string == nullptr) {
+      self->vtable->throw_error_from_void == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_nullable_string = fl_value_get_string(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableStringResponse)
-      response = self->vtable->echo_nullable_string(a_nullable_string,
-                                                    self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowErrorFromVoidResponse)
+      response = self->vtable->throw_error_from_void(self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableString");
+              "throwErrorFromVoid");
     return;
   }
 
@@ -12666,32 +13539,26 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableString", error->message);
+              "throwErrorFromVoid", error->message);
   }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_uint8_list_cb(
+core_tests_pigeon_test_host_integration_core_api_throw_flutter_error_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_uint8_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->throw_flutter_error == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* a_nullable_uint8_list = fl_value_get_uint8_list(value0);
-  size_t a_nullable_uint8_list_length = fl_value_get_length(value0);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableUint8ListResponse)
-      response = self->vtable->echo_nullable_uint8_list(
-          a_nullable_uint8_list, a_nullable_uint8_list_length, self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiThrowFlutterErrorResponse)
+      response = self->vtable->throw_flutter_error(self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableUint8List");
+              "throwFlutterError");
     return;
   }
 
@@ -12699,30 +13566,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_uint8_list_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableUint8List", error->message);
+              "throwFlutterError", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_object_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_object == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* a_nullable_object = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableObjectResponse)
-      response = self->vtable->echo_nullable_object(a_nullable_object,
-                                                    self->user_data);
+  int64_t an_int = fl_value_get_int(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoIntResponse) response =
+      self->vtable->echo_int(an_int, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableObject");
+              "echoInt");
     return;
   }
 
@@ -12730,29 +13594,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_object_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableObject", error->message);
+              "echoInt", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_list_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_double_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_nullable_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_double == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* a_nullable_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableListResponse)
-      response =
-          self->vtable->echo_nullable_list(a_nullable_list, self->user_data);
+  double a_double = fl_value_get_float(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoDoubleResponse)
+      response = self->vtable->echo_double(a_double, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableList");
+              "echoDouble");
     return;
   }
 
@@ -12760,31 +13622,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_list_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableList", error->message);
+              "echoDouble", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_list_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_bool_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_enum_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_bool == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_list = value0;
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumListResponse)
-      response =
-          self->vtable->echo_nullable_enum_list(enum_list, self->user_data);
+  gboolean a_bool = fl_value_get_bool(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoBoolResponse)
+      response = self->vtable->echo_bool(a_bool, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableEnumList");
+              "echoBool");
     return;
   }
 
@@ -12792,31 +13650,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_list_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableEnumList", error->message);
+              "echoBool", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_class_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_list = value0;
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassListResponse)
-      response =
-          self->vtable->echo_nullable_class_list(class_list, self->user_data);
+  const gchar* a_string = fl_value_get_string(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoStringResponse)
+      response = self->vtable->echo_string(a_string, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableClassList");
+              "echoString");
     return;
   }
 
@@ -12824,28 +13678,29 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableClassList", error->message);
+              "echoString", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_uint8_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_nullable_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_uint8_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse)
-      response = self->vtable->echo_nullable_map(map, self->user_data);
+  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
+  size_t a_uint8_list_length = fl_value_get_length(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoUint8ListResponse)
+      response = self->vtable->echo_uint8_list(
+          a_uint8_list, a_uint8_list_length, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableMap");
+              "echoUint8List");
     return;
   }
 
@@ -12853,31 +13708,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableMap", error->message);
+              "echoUint8List", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_object_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_string_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_object == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* string_map = value0;
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableStringMapResponse)
-      response =
-          self->vtable->echo_nullable_string_map(string_map, self->user_data);
+  FlValue* an_object = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoObjectResponse)
+      response = self->vtable->echo_object(an_object, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableStringMap");
+              "echoObject");
     return;
   }
 
@@ -12885,29 +13736,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_map_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableStringMap", error->message);
+              "echoObject", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_int_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* int_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableIntMapResponse)
-      response = self->vtable->echo_nullable_int_map(int_map, self->user_data);
+  FlValue* list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoListResponse)
+      response = self->vtable->echo_list(list, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableIntMap");
+              "echoList");
     return;
   }
 
@@ -12915,31 +13764,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_map_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableIntMap", error->message);
+              "echoList", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_enum_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_enum_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_map = value0;
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumMapResponse)
-      response =
-          self->vtable->echo_nullable_enum_map(enum_map, self->user_data);
+  FlValue* enum_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumListResponse)
+      response = self->vtable->echo_enum_list(enum_list, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableEnumMap");
+              "echoEnumList");
     return;
   }
 
@@ -12947,31 +13792,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_map_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableEnumMap", error->message);
+              "echoEnumList", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_nullable_class_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_class_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_map = value0;
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassMapResponse)
-      response =
-          self->vtable->echo_nullable_class_map(class_map, self->user_data);
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassListResponse)
+      response = self->vtable->echo_class_list(class_list, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableClassMap");
+              "echoClassList");
     return;
   }
 
@@ -12979,35 +13820,31 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableClassMap", error->message);
+              "echoClassList", error->message);
   }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_nullable_enum == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_non_null_enum_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
-  CoreTestsPigeonTestAnEnum an_enum_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
-        fl_value_get_int(reinterpret_cast<FlValue*>(
-            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-    an_enum = &an_enum_value;
-  }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse)
-      response = self->vtable->echo_nullable_enum(an_enum, self->user_data);
+  FlValue* enum_list = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse)
+      response =
+          self->vtable->echo_non_null_enum_list(enum_list, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNullableEnum");
+              "echoNonNullEnumList");
     return;
   }
 
@@ -13015,38 +13852,31 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNullableEnum", error->message);
+              "echoNonNullEnumList", error->message);
   }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_another_nullable_enum == nullptr) {
+      self->vtable->echo_non_null_class_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
-  CoreTestsPigeonTestAnotherEnum another_enum_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    another_enum_value = static_cast<CoreTestsPigeonTestAnotherEnum>(
-        fl_value_get_int(reinterpret_cast<FlValue*>(
-            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-    another_enum = &another_enum_value;
-  }
+  FlValue* class_list = value0;
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse)
-      response = self->vtable->echo_another_nullable_enum(another_enum,
-                                                          self->user_data);
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse)
+      response =
+          self->vtable->echo_non_null_class_list(class_list, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoAnotherNullableEnum");
+              "echoNonNullClassList");
     return;
   }
 
@@ -13054,36 +13884,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherNullableEnum", error->message);
+              "echoNonNullClassList", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_optional_nullable_int == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value0);
-    a_nullable_int = &a_nullable_int_value;
-  }
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse)
-      response = self->vtable->echo_optional_nullable_int(a_nullable_int,
-                                                          self->user_data);
+  FlValue* map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse) response =
+      self->vtable->echo_map(map, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoOptionalNullableInt");
+              "echoMap");
     return;
   }
 
@@ -13091,31 +13912,27 @@ core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoOptionalNullableInt", error->message);
+              "echoMap", error->message);
   }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_string_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_named_nullable_string == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_string_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_nullable_string = fl_value_get_string(value0);
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse)
-      response = self->vtable->echo_named_nullable_string(a_nullable_string,
-                                                          self->user_data);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoStringMapResponse)
+      response = self->vtable->echo_string_map(string_map, self->user_data);
   if (response == nullptr) {
     g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
-              "echoNamedNullableString");
+              "echoStringMap");
     return;
   }
 
@@ -13123,1122 +13940,1555 @@ core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_cb(
   if (!fl_basic_message_channel_respond(channel, response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoNamedNullableString", error->message);
+              "echoStringMap", error->message);
   }
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_noop_async_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_int_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->noop_async == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_int_map == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->noop_async(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoIntMapResponse)
+      response = self->vtable->echo_int_map(int_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoIntMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoIntMap", error->message);
+  }
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_async_int_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_enum_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_int == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_enum_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t an_int = fl_value_get_int(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_int(an_int, handle, self->user_data);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumMapResponse)
+      response = self->vtable->echo_enum_map(enum_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoEnumMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoEnumMap", error->message);
+  }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_double_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_class_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_double == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_class_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double a_double = fl_value_get_float(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_double(a_double, handle, self->user_data);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassMapResponse)
+      response = self->vtable->echo_class_map(class_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoClassMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoClassMap", error->message);
+  }
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_async_bool_cb(
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_bool == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_non_null_string_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean a_bool = fl_value_get_bool(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_bool(a_bool, handle, self->user_data);
+  FlValue* string_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse)
+      response =
+          self->vtable->echo_non_null_string_map(string_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNonNullStringMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNonNullStringMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_string == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_non_null_int_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_string(a_string, handle, self->user_data);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse)
+      response = self->vtable->echo_non_null_int_map(int_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNonNullIntMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNonNullIntMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_uint8_list == nullptr) {
+      self->vtable->echo_non_null_enum_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
-  size_t a_uint8_list_length = fl_value_get_length(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_uint8_list(a_uint8_list, a_uint8_list_length, handle,
-                                      self->user_data);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse)
+      response =
+          self->vtable->echo_non_null_enum_map(enum_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNonNullEnumMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNonNullEnumMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_object_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_object == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_non_null_class_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* an_object = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_object(an_object, handle, self->user_data);
+  FlValue* class_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse)
+      response =
+          self->vtable->echo_non_null_class_map(class_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNonNullClassMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNonNullClassMap", error->message);
+  }
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_async_list_cb(
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_class_wrapper == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_list(list, handle, self->user_data);
+  CoreTestsPigeonTestAllClassesWrapper* wrapper =
+      CORE_TESTS_PIGEON_TEST_ALL_CLASSES_WRAPPER(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse)
+      response = self->vtable->echo_class_wrapper(wrapper, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoClassWrapper");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoClassWrapper", error->message);
+  }
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_enum_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_enum == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_enum_list(enum_list, handle, self->user_data);
+  CoreTestsPigeonTestAnEnum an_enum = static_cast<CoreTestsPigeonTestAnEnum>(
+      fl_value_get_int(reinterpret_cast<FlValue*>(
+          const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoEnumResponse)
+      response = self->vtable->echo_enum(an_enum, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoEnum");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoEnum", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_another_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_class_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_another_enum == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_class_list(class_list, handle, self->user_data);
+  CoreTestsPigeonTestAnotherEnum another_enum =
+      static_cast<CoreTestsPigeonTestAnotherEnum>(
+          fl_value_get_int(reinterpret_cast<FlValue*>(
+              const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherEnumResponse)
+      response = self->vtable->echo_another_enum(another_enum, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoAnotherEnum");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherEnum", error->message);
+  }
 }
 
-static void core_tests_pigeon_test_host_integration_core_api_echo_async_map_cb(
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_named_default_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_map == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_named_default_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_map(map, handle, self->user_data);
+  const gchar* a_string = fl_value_get_string(value0);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedDefaultStringResponse)
+      response =
+          self->vtable->echo_named_default_string(a_string, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNamedDefaultString");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNamedDefaultString", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_optional_default_double_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_string_map == nullptr) {
+      self->vtable->echo_optional_default_double == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* string_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_string_map(string_map, handle, self->user_data);
+  double a_double = fl_value_get_float(value0);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalDefaultDoubleResponse)
+      response =
+          self->vtable->echo_optional_default_double(a_double, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoOptionalDefaultDouble");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoOptionalDefaultDouble", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_required_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_int_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_required_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* int_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_int_map(int_map, handle, self->user_data);
+  int64_t an_int = fl_value_get_int(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoRequiredIntResponse)
+      response = self->vtable->echo_required_int(an_int, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoRequiredInt");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoRequiredInt", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_all_nullable_types_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->echo_async_enum_map == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_all_nullable_types == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_enum_map(enum_map, handle, self->user_data);
+  CoreTestsPigeonTestAllNullableTypes* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAllNullableTypesResponse)
+      response =
+          self->vtable->echo_all_nullable_types(everything, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoAllNullableTypes");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAllNullableTypes", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_all_nullable_types_without_recursion_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_class_map == nullptr) {
+      self->vtable->echo_all_nullable_types_without_recursion == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_class_map(class_map, handle, self->user_data);
-}
-
-static void core_tests_pigeon_test_host_integration_core_api_echo_async_enum_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
-
-  if (self->vtable == nullptr || self->vtable->echo_async_enum == nullptr) {
+  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse)
+      response = self->vtable->echo_all_nullable_types_without_recursion(
+          everything, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoAllNullableTypesWithoutRecursion");
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnEnum an_enum = static_cast<CoreTestsPigeonTestAnEnum>(
-      fl_value_get_int(reinterpret_cast<FlValue*>(
-          const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_enum(an_enum, handle, self->user_data);
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAllNullableTypesWithoutRecursion", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_extract_nested_nullable_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_another_async_enum == nullptr) {
+      self->vtable->extract_nested_nullable_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnotherEnum another_enum =
-      static_cast<CoreTestsPigeonTestAnotherEnum>(
-          fl_value_get_int(reinterpret_cast<FlValue*>(
-              const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_another_async_enum(another_enum, handle, self->user_data);
-}
-
-static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_cb(
-    FlBasicMessageChannel* channel, FlValue* message_,
-    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
-  CoreTestsPigeonTestHostIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
-
-  if (self->vtable == nullptr || self->vtable->throw_async_error == nullptr) {
+  CoreTestsPigeonTestAllClassesWrapper* wrapper =
+      CORE_TESTS_PIGEON_TEST_ALL_CLASSES_WRAPPER(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiExtractNestedNullableStringResponse)
+      response = self->vtable->extract_nested_nullable_string(wrapper,
+                                                              self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "extractNestedNullableString");
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->throw_async_error(handle, self->user_data);
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "extractNestedNullableString", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_cb(
+core_tests_pigeon_test_host_integration_core_api_create_nested_nullable_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->throw_async_error_from_void == nullptr) {
+      self->vtable->create_nested_nullable_string == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->throw_async_error_from_void(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const gchar* nullable_string = fl_value_get_string(value0);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCreateNestedNullableStringResponse)
+      response = self->vtable->create_nested_nullable_string(nullable_string,
+                                                             self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "createNestedNullableString");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "createNestedNullableString", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_cb(
+core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->throw_async_flutter_error == nullptr) {
+      self->vtable->send_multiple_nullable_types == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->throw_async_flutter_error(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  gboolean* a_nullable_bool = nullptr;
+  gboolean a_nullable_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_bool_value = fl_value_get_bool(value0);
+    a_nullable_bool = &a_nullable_bool_value;
+  }
+  FlValue* value1 = fl_value_get_list_value(message_, 1);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value1);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  FlValue* value2 = fl_value_get_list_value(message_, 2);
+  const gchar* a_nullable_string = fl_value_get_string(value2);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiSendMultipleNullableTypesResponse)
+      response = self->vtable->send_multiple_nullable_types(
+          a_nullable_bool, a_nullable_int, a_nullable_string, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "sendMultipleNullableTypes");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "sendMultipleNullableTypes", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_cb(
+core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_without_recursion_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_all_types == nullptr) {
+      self->vtable->send_multiple_nullable_types_without_recursion == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
-      fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_all_types(everything, handle, self->user_data);
+  gboolean* a_nullable_bool = nullptr;
+  gboolean a_nullable_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_bool_value = fl_value_get_bool(value0);
+    a_nullable_bool = &a_nullable_bool_value;
+  }
+  FlValue* value1 = fl_value_get_list_value(message_, 1);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value1);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  FlValue* value2 = fl_value_get_list_value(message_, 2);
+  const gchar* a_nullable_string = fl_value_get_string(value2);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse)
+      response = self->vtable->send_multiple_nullable_types_without_recursion(
+          a_nullable_bool, a_nullable_int, a_nullable_string, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "sendMultipleNullableTypesWithoutRecursion");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "sendMultipleNullableTypesWithoutRecursion", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_all_nullable_types == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_nullable_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypes* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_all_nullable_types(everything, handle,
-                                                       self->user_data);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value0);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableIntResponse)
+      response =
+          self->vtable->echo_nullable_int(a_nullable_int, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableInt");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableInt", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_double_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_all_nullable_types_without_recursion ==
-          nullptr) {
+      self->vtable->echo_nullable_double == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_all_nullable_types_without_recursion(
-      everything, handle, self->user_data);
+  double* a_nullable_double = nullptr;
+  double a_nullable_double_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_double_value = fl_value_get_float(value0);
+    a_nullable_double = &a_nullable_double_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableDoubleResponse)
+      response = self->vtable->echo_nullable_double(a_nullable_double,
+                                                    self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableDouble");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableDouble", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_bool_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_int == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_nullable_bool == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t* an_int = nullptr;
-  int64_t an_int_value;
+  gboolean* a_nullable_bool = nullptr;
+  gboolean a_nullable_bool_value;
   if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    an_int_value = fl_value_get_int(value0);
-    an_int = &an_int_value;
+    a_nullable_bool_value = fl_value_get_bool(value0);
+    a_nullable_bool = &a_nullable_bool_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableBoolResponse)
+      response =
+          self->vtable->echo_nullable_bool(a_nullable_bool, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableBool");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableBool", error->message);
   }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_int(an_int, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_double == nullptr) {
+      self->vtable->echo_nullable_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double* a_double = nullptr;
-  double a_double_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_double_value = fl_value_get_float(value0);
-    a_double = &a_double_value;
+  const gchar* a_nullable_string = fl_value_get_string(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableStringResponse)
+      response = self->vtable->echo_nullable_string(a_nullable_string,
+                                                    self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableString");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableString", error->message);
   }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_double(a_double, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_uint8_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_bool == nullptr) {
+      self->vtable->echo_nullable_uint8_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_bool = nullptr;
-  gboolean a_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_bool_value = fl_value_get_bool(value0);
-    a_bool = &a_bool_value;
+  const uint8_t* a_nullable_uint8_list = fl_value_get_uint8_list(value0);
+  size_t a_nullable_uint8_list_length = fl_value_get_length(value0);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableUint8ListResponse)
+      response = self->vtable->echo_nullable_uint8_list(
+          a_nullable_uint8_list, a_nullable_uint8_list_length, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableUint8List");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableUint8List", error->message);
   }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_bool(a_bool, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_object_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_string == nullptr) {
+      self->vtable->echo_nullable_object == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_string(a_string, handle, self->user_data);
+  FlValue* a_nullable_object = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableObjectResponse)
+      response = self->vtable->echo_nullable_object(a_nullable_object,
+                                                    self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableObject");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableObject", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_uint8_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_nullable_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
-  size_t a_uint8_list_length = fl_value_get_length(value0);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_uint8_list(
-      a_uint8_list, a_uint8_list_length, handle, self->user_data);
+  FlValue* a_nullable_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableListResponse)
+      response =
+          self->vtable->echo_nullable_list(a_nullable_list, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableList");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableList", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_object == nullptr) {
+      self->vtable->echo_nullable_enum_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* an_object = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_object(an_object, handle, self->user_data);
-}
-
+  FlValue* enum_list = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumListResponse)
+      response =
+          self->vtable->echo_nullable_enum_list(enum_list, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableEnumList");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableEnumList", error->message);
+  }
+}
+
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_list == nullptr) {
+      self->vtable->echo_nullable_class_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_list(list, handle, self->user_data);
+  FlValue* class_list = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassListResponse)
+      response =
+          self->vtable->echo_nullable_class_list(class_list, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableClassList");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableClassList", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_enum_list == nullptr) {
+      self->vtable->echo_nullable_non_null_enum_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* enum_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_enum_list(enum_list, handle,
-                                              self->user_data);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse)
+      response = self->vtable->echo_nullable_non_null_enum_list(
+          enum_list, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullEnumList");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullEnumList", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_class_list == nullptr) {
+      self->vtable->echo_nullable_non_null_class_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* class_list = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_class_list(class_list, handle,
-                                               self->user_data);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse)
+      response = self->vtable->echo_nullable_non_null_class_list(
+          class_list, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullClassList");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullClassList", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_nullable_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_map(map, handle, self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse)
+      response = self->vtable->echo_nullable_map(map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_string_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_string_map == nullptr) {
+      self->vtable->echo_nullable_string_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* string_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_string_map(string_map, handle,
-                                               self->user_data);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableStringMapResponse)
+      response =
+          self->vtable->echo_nullable_string_map(string_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableStringMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableStringMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_int_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_int_map == nullptr) {
+      self->vtable->echo_nullable_int_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* int_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_int_map(int_map, handle, self->user_data);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableIntMapResponse)
+      response = self->vtable->echo_nullable_int_map(int_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableIntMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableIntMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_enum_map == nullptr) {
+      self->vtable->echo_nullable_enum_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* enum_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_enum_map(enum_map, handle, self->user_data);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumMapResponse)
+      response =
+          self->vtable->echo_nullable_enum_map(enum_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableEnumMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableEnumMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_class_map == nullptr) {
+      self->vtable->echo_nullable_class_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
   FlValue* class_map = value0;
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_class_map(class_map, handle,
-                                              self->user_data);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassMapResponse)
+      response =
+          self->vtable->echo_nullable_class_map(class_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableClassMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableClassMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_async_nullable_enum == nullptr) {
+      self->vtable->echo_nullable_non_null_string_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
-  CoreTestsPigeonTestAnEnum an_enum_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
-        fl_value_get_int(reinterpret_cast<FlValue*>(
-            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-    an_enum = &an_enum_value;
+  FlValue* string_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse)
+      response = self->vtable->echo_nullable_non_null_string_map(
+          string_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullStringMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullStringMap", error->message);
   }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_async_nullable_enum(an_enum, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->echo_another_async_nullable_enum == nullptr) {
+      self->vtable->echo_nullable_non_null_int_map == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
-  CoreTestsPigeonTestAnotherEnum another_enum_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    another_enum_value = static_cast<CoreTestsPigeonTestAnotherEnum>(
-        fl_value_get_int(reinterpret_cast<FlValue*>(
-            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-    another_enum = &another_enum_value;
+  FlValue* int_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse)
+      response = self->vtable->echo_nullable_non_null_int_map(int_map,
+                                                              self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullIntMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullIntMap", error->message);
   }
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->echo_another_async_nullable_enum(another_enum, handle,
-                                                 self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr || self->vtable->call_flutter_noop == nullptr) {
+  if (self->vtable == nullptr ||
+      self->vtable->echo_nullable_non_null_enum_map == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_noop(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse)
+      response = self->vtable->echo_nullable_non_null_enum_map(enum_map,
+                                                               self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullEnumMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullEnumMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_throw_error == nullptr) {
+      self->vtable->echo_nullable_non_null_class_map == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_throw_error(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse)
+      response = self->vtable->echo_nullable_non_null_class_map(
+          class_map, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableNonNullClassMap");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableNonNullClassMap", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_throw_error_from_void == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_nullable_enum == nullptr) {
     return;
   }
 
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_throw_error_from_void(handle, self->user_data);
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
+  CoreTestsPigeonTestAnEnum an_enum_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
+        fl_value_get_int(reinterpret_cast<FlValue*>(
+            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+    an_enum = &an_enum_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse)
+      response = self->vtable->echo_nullable_enum(an_enum, self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNullableEnum");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNullableEnum", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_all_types == nullptr) {
+      self->vtable->echo_another_nullable_enum == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
-      fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_echo_all_types(everything, handle,
-                                            self->user_data);
+  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
+  CoreTestsPigeonTestAnotherEnum another_enum_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    another_enum_value = static_cast<CoreTestsPigeonTestAnotherEnum>(
+        fl_value_get_int(reinterpret_cast<FlValue*>(
+            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+    another_enum = &another_enum_value;
+  }
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse)
+      response = self->vtable->echo_another_nullable_enum(another_enum,
+                                                          self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoAnotherNullableEnum");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherNullableEnum", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_all_nullable_types == nullptr) {
+      self->vtable->echo_optional_nullable_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypes* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
-          fl_value_get_custom_value_object(value0));
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_echo_all_nullable_types(everything, handle,
-                                                     self->user_data);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value0);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse)
+      response = self->vtable->echo_optional_nullable_int(a_nullable_int,
+                                                          self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoOptionalNullableInt");
+    return;
+  }
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoOptionalNullableInt", error->message);
+  }
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_named_nullable_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_send_multiple_nullable_types == nullptr) {
+      self->vtable->echo_named_nullable_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_nullable_bool = nullptr;
-  gboolean a_nullable_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_bool_value = fl_value_get_bool(value0);
-    a_nullable_bool = &a_nullable_bool_value;
+  const gchar* a_nullable_string = fl_value_get_string(value0);
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoNamedNullableStringResponse)
+      response = self->vtable->echo_named_nullable_string(a_nullable_string,
+                                                          self->user_data);
+  if (response == nullptr) {
+    g_warning("No response returned to %s.%s", "HostIntegrationCoreApi",
+              "echoNamedNullableString");
+    return;
   }
-  FlValue* value1 = fl_value_get_list_value(message_, 1);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value1);
-    a_nullable_int = &a_nullable_int_value;
+
+  g_autoptr(GError) error = NULL;
+  if (!fl_basic_message_channel_respond(channel, response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoNamedNullableString", error->message);
   }
-  FlValue* value2 = fl_value_get_list_value(message_, 2);
-  const gchar* a_nullable_string = fl_value_get_string(value2);
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
-      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
-          channel, response_handle);
-  self->vtable->call_flutter_send_multiple_nullable_types(
-      a_nullable_bool, a_nullable_int, a_nullable_string, handle,
-      self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_cb(
+static void core_tests_pigeon_test_host_integration_core_api_noop_async_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_all_nullable_types_without_recursion ==
-          nullptr) {
+  if (self->vtable == nullptr || self->vtable->noop_async == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
-      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
-          fl_value_get_custom_value_object(value0));
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_all_nullable_types_without_recursion(
-      everything, handle, self->user_data);
+  self->vtable->noop_async(handle, self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_async_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable
-              ->call_flutter_send_multiple_nullable_types_without_recursion ==
-          nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_nullable_bool = nullptr;
-  gboolean a_nullable_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_nullable_bool_value = fl_value_get_bool(value0);
-    a_nullable_bool = &a_nullable_bool_value;
-  }
-  FlValue* value1 = fl_value_get_list_value(message_, 1);
-  int64_t* a_nullable_int = nullptr;
-  int64_t a_nullable_int_value;
-  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
-    a_nullable_int_value = fl_value_get_int(value1);
-    a_nullable_int = &a_nullable_int_value;
-  }
-  FlValue* value2 = fl_value_get_list_value(message_, 2);
-  const gchar* a_nullable_string = fl_value_get_string(value2);
+  int64_t an_int = fl_value_get_int(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_send_multiple_nullable_types_without_recursion(
-      a_nullable_bool, a_nullable_int, a_nullable_string, handle,
-      self->user_data);
+  self->vtable->echo_async_int(an_int, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_double_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_bool == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_double == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean a_bool = fl_value_get_bool(value0);
+  double a_double = fl_value_get_float(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_bool(a_bool, handle, self->user_data);
+  self->vtable->echo_async_double(a_double, handle, self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_async_bool_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_int == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_bool == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t an_int = fl_value_get_int(value0);
+  gboolean a_bool = fl_value_get_bool(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_int(an_int, handle, self->user_data);
+  self->vtable->echo_async_bool(a_bool, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_double == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double a_double = fl_value_get_float(value0);
+  const gchar* a_string = fl_value_get_string(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_double(a_double, handle, self->user_data);
+  self->vtable->echo_async_string(a_string, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_string == nullptr) {
+      self->vtable->echo_async_uint8_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
+  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
+  size_t a_uint8_list_length = fl_value_get_length(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_string(a_string, handle, self->user_data);
+  self->vtable->echo_async_uint8_list(a_uint8_list, a_uint8_list_length, handle,
+                                      self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_object_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_uint8_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_object == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* list = fl_value_get_uint8_list(value0);
-  size_t list_length = fl_value_get_length(value0);
+  FlValue* an_object = value0;
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_uint8_list(list, list_length, handle,
-                                             self->user_data);
+  self->vtable->echo_async_object(an_object, handle, self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_async_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_list == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_list == nullptr) {
     return;
   }
 
@@ -14247,18 +15497,18 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_list(list, handle, self->user_data);
+  self->vtable->echo_async_list(list, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_enum_list == nullptr) {
+      self->vtable->echo_async_enum_list == nullptr) {
     return;
   }
 
@@ -14267,18 +15517,18 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_enum_list(enum_list, handle, self->user_data);
+  self->vtable->echo_async_enum_list(enum_list, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_class_list == nullptr) {
+      self->vtable->echo_async_class_list == nullptr) {
     return;
   }
 
@@ -14287,19 +15537,16 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_cb
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_class_list(class_list, handle,
-                                             self->user_data);
+  self->vtable->echo_async_class_list(class_list, handle, self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_async_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_map == nullptr) {
     return;
   }
 
@@ -14308,18 +15555,18 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_map(map, handle, self->user_data);
+  self->vtable->echo_async_map(map, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_string_map == nullptr) {
+      self->vtable->echo_async_string_map == nullptr) {
     return;
   }
 
@@ -14328,19 +15575,17 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_cb
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_string_map(string_map, handle,
-                                             self->user_data);
+  self->vtable->echo_async_string_map(string_map, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_int_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_int_map == nullptr) {
     return;
   }
 
@@ -14349,18 +15594,17 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_int_map(int_map, handle, self->user_data);
+  self->vtable->echo_async_int_map(int_map, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_enum_map == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_enum_map == nullptr) {
     return;
   }
 
@@ -14369,18 +15613,18 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_enum_map(enum_map, handle, self->user_data);
+  self->vtable->echo_async_enum_map(enum_map, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_class_map == nullptr) {
+      self->vtable->echo_async_class_map == nullptr) {
     return;
   }
 
@@ -14389,18 +15633,16 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_class_map(class_map, handle, self->user_data);
+  self->vtable->echo_async_class_map(class_map, handle, self->user_data);
 }
 
-static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_cb(
+static void core_tests_pigeon_test_host_integration_core_api_echo_async_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_enum == nullptr) {
+  if (self->vtable == nullptr || self->vtable->echo_async_enum == nullptr) {
     return;
   }
 
@@ -14411,18 +15653,18 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_cb(
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_enum(an_enum, handle, self->user_data);
+  self->vtable->echo_async_enum(an_enum, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_another_enum == nullptr) {
+      self->vtable->echo_another_async_enum == nullptr) {
     return;
   }
 
@@ -14434,338 +15676,472 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_another_enum(another_enum, handle,
-                                               self->user_data);
+  self->vtable->echo_another_async_enum(another_enum, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_cb(
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_bool == nullptr) {
+  if (self->vtable == nullptr || self->vtable->throw_async_error == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  gboolean* a_bool = nullptr;
-  gboolean a_bool_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_bool_value = fl_value_get_bool(value0);
-    a_bool = &a_bool_value;
-  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_bool(a_bool, handle,
-                                                self->user_data);
+  self->vtable->throw_async_error(handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_cb(
+core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_int == nullptr) {
+      self->vtable->throw_async_error_from_void == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  int64_t* an_int = nullptr;
-  int64_t an_int_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    an_int_value = fl_value_get_int(value0);
-    an_int = &an_int_value;
-  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_int(an_int, handle, self->user_data);
+  self->vtable->throw_async_error_from_void(handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_cb(
+core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_double == nullptr) {
+      self->vtable->throw_async_flutter_error == nullptr) {
     return;
   }
 
-  FlValue* value0 = fl_value_get_list_value(message_, 0);
-  double* a_double = nullptr;
-  double a_double_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    a_double_value = fl_value_get_float(value0);
-    a_double = &a_double_value;
-  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_double(a_double, handle,
-                                                  self->user_data);
+  self->vtable->throw_async_flutter_error(handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_string == nullptr) {
+      self->vtable->echo_async_all_types == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
+  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
+      fl_value_get_custom_value_object(value0));
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_string(a_string, handle,
-                                                  self->user_data);
+  self->vtable->echo_async_all_types(everything, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_uint8_list == nullptr) {
+      self->vtable->echo_async_nullable_all_nullable_types == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const uint8_t* list = fl_value_get_uint8_list(value0);
-  size_t list_length = fl_value_get_length(value0);
+  CoreTestsPigeonTestAllNullableTypes* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
+          fl_value_get_custom_value_object(value0));
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_uint8_list(list, list_length, handle,
-                                                      self->user_data);
+  self->vtable->echo_async_nullable_all_nullable_types(everything, handle,
+                                                       self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_list == nullptr) {
+      self->vtable->echo_async_nullable_all_nullable_types_without_recursion ==
+          nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* list = value0;
+  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
+          fl_value_get_custom_value_object(value0));
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_list(list, handle, self->user_data);
+  self->vtable->echo_async_nullable_all_nullable_types_without_recursion(
+      everything, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_enum_list == nullptr) {
+      self->vtable->echo_async_nullable_int == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_list = value0;
+  int64_t* an_int = nullptr;
+  int64_t an_int_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    an_int_value = fl_value_get_int(value0);
+    an_int = &an_int_value;
+  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_enum_list(enum_list, handle,
-                                                     self->user_data);
+  self->vtable->echo_async_nullable_int(an_int, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_class_list == nullptr) {
+      self->vtable->echo_async_nullable_double == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_list = value0;
+  double* a_double = nullptr;
+  double a_double_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_double_value = fl_value_get_float(value0);
+    a_double = &a_double_value;
+  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_class_list(class_list, handle,
-                                                      self->user_data);
+  self->vtable->echo_async_nullable_double(a_double, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_map == nullptr) {
+      self->vtable->echo_async_nullable_bool == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* map = value0;
+  gboolean* a_bool = nullptr;
+  gboolean a_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_bool_value = fl_value_get_bool(value0);
+    a_bool = &a_bool_value;
+  }
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_map(map, handle, self->user_data);
+  self->vtable->echo_async_nullable_bool(a_bool, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_string_map == nullptr) {
+      self->vtable->echo_async_nullable_string == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* string_map = value0;
+  const gchar* a_string = fl_value_get_string(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_string_map(string_map, handle,
-                                                      self->user_data);
+  self->vtable->echo_async_nullable_string(a_string, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_int_map == nullptr) {
+      self->vtable->echo_async_nullable_uint8_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* int_map = value0;
+  const uint8_t* a_uint8_list = fl_value_get_uint8_list(value0);
+  size_t a_uint8_list_length = fl_value_get_length(value0);
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_int_map(int_map, handle,
-                                                   self->user_data);
+  self->vtable->echo_async_nullable_uint8_list(
+      a_uint8_list, a_uint8_list_length, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_enum_map == nullptr) {
+      self->vtable->echo_async_nullable_object == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* enum_map = value0;
+  FlValue* an_object = value0;
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_enum_map(enum_map, handle,
-                                                    self->user_data);
+  self->vtable->echo_async_nullable_object(an_object, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_class_map == nullptr) {
+      self->vtable->echo_async_nullable_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  FlValue* class_map = value0;
+  FlValue* list = value0;
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_class_map(class_map, handle,
-                                                     self->user_data);
+  self->vtable->echo_async_nullable_list(list, handle, self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_nullable_enum == nullptr) {
+      self->vtable->echo_async_nullable_enum_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
-  CoreTestsPigeonTestAnEnum an_enum_value;
-  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
-    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
-        fl_value_get_int(reinterpret_cast<FlValue*>(
-            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
-    an_enum = &an_enum_value;
-  }
+  FlValue* enum_list = value0;
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_nullable_enum(an_enum, handle,
-                                                self->user_data);
+  self->vtable->echo_async_nullable_enum_list(enum_list, handle,
+                                              self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_cb(
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_echo_another_nullable_enum == nullptr) {
+      self->vtable->echo_async_nullable_class_list == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_class_list(class_list, handle,
+                                               self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_map(map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_string_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_string_map(string_map, handle,
+                                               self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_int_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_int_map(int_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_enum_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_enum_map(enum_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_class_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_class_map(class_map, handle,
+                                              self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_async_nullable_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
+  CoreTestsPigeonTestAnEnum an_enum_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
+        fl_value_get_int(reinterpret_cast<FlValue*>(
+            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+    an_enum = &an_enum_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->echo_async_nullable_enum(an_enum, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->echo_another_async_nullable_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
   CoreTestsPigeonTestAnotherEnum another_enum_value;
   if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
     another_enum_value = static_cast<CoreTestsPigeonTestAnotherEnum>(
@@ -14776,63 +16152,1163 @@ core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nulla
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_echo_another_nullable_enum(another_enum, handle,
-                                                        self->user_data);
+  self->vtable->echo_another_async_nullable_enum(another_enum, handle,
+                                                 self->user_data);
 }
 
 static void
-core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_cb(
+core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr || self->vtable->call_flutter_noop == nullptr) {
+    return;
+  }
+
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_noop(handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_cb(
     FlBasicMessageChannel* channel, FlValue* message_,
     FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
   CoreTestsPigeonTestHostIntegrationCoreApi* self =
       CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
   if (self->vtable == nullptr ||
-      self->vtable->call_flutter_small_api_echo_string == nullptr) {
+      self->vtable->call_flutter_throw_error == nullptr) {
+    return;
+  }
+
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_throw_error(handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_throw_error_from_void == nullptr) {
+    return;
+  }
+
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_throw_error_from_void(handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_all_types == nullptr) {
     return;
   }
 
   FlValue* value0 = fl_value_get_list_value(message_, 0);
-  const gchar* a_string = fl_value_get_string(value0);
+  CoreTestsPigeonTestAllTypes* everything = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
+      fl_value_get_custom_value_object(value0));
   g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
       core_tests_pigeon_test_host_integration_core_api_response_handle_new(
           channel, response_handle);
-  self->vtable->call_flutter_small_api_echo_string(a_string, handle,
-                                                   self->user_data);
+  self->vtable->call_flutter_echo_all_types(everything, handle,
+                                            self->user_data);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
-    FlBinaryMessenger* messenger, const gchar* suffix,
-    const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable,
-    gpointer user_data, GDestroyNotify user_data_free_func) {
-  g_autofree gchar* dot_suffix =
-      suffix != nullptr ? g_strdup_printf(".%s", suffix) : g_strdup("");
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApi) api_data =
-      core_tests_pigeon_test_host_integration_core_api_new(vtable, user_data,
-                                                           user_data_free_func);
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
 
-  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
-      core_tests_pigeon_test_message_codec_new();
-  g_autofree gchar* noop_channel_name = g_strdup_printf(
-      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop%"
-      "s",
-      dot_suffix);
-  g_autoptr(FlBasicMessageChannel) noop_channel = fl_basic_message_channel_new(
-      messenger, noop_channel_name, FL_MESSAGE_CODEC(codec));
-  fl_basic_message_channel_set_message_handler(
-      noop_channel, core_tests_pigeon_test_host_integration_core_api_noop_cb,
-      g_object_ref(api_data), g_object_unref);
-  g_autofree gchar* echo_all_types_channel_name = g_strdup_printf(
-      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-      "echoAllTypes%s",
-      dot_suffix);
-  g_autoptr(FlBasicMessageChannel) echo_all_types_channel =
-      fl_basic_message_channel_new(messenger, echo_all_types_channel_name,
-                                   FL_MESSAGE_CODEC(codec));
-  fl_basic_message_channel_set_message_handler(
-      echo_all_types_channel,
-      core_tests_pigeon_test_host_integration_core_api_echo_all_types_cb,
-      g_object_ref(api_data), g_object_unref);
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_all_nullable_types == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAllNullableTypes* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_all_nullable_types(everything, handle,
+                                                     self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_send_multiple_nullable_types == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  gboolean* a_nullable_bool = nullptr;
+  gboolean a_nullable_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_bool_value = fl_value_get_bool(value0);
+    a_nullable_bool = &a_nullable_bool_value;
+  }
+  FlValue* value1 = fl_value_get_list_value(message_, 1);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value1);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  FlValue* value2 = fl_value_get_list_value(message_, 2);
+  const gchar* a_nullable_string = fl_value_get_string(value2);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_send_multiple_nullable_types(
+      a_nullable_bool, a_nullable_int, a_nullable_string, handle,
+      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_all_nullable_types_without_recursion ==
+          nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything =
+      CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
+          fl_value_get_custom_value_object(value0));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_all_nullable_types_without_recursion(
+      everything, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable
+              ->call_flutter_send_multiple_nullable_types_without_recursion ==
+          nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  gboolean* a_nullable_bool = nullptr;
+  gboolean a_nullable_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_nullable_bool_value = fl_value_get_bool(value0);
+    a_nullable_bool = &a_nullable_bool_value;
+  }
+  FlValue* value1 = fl_value_get_list_value(message_, 1);
+  int64_t* a_nullable_int = nullptr;
+  int64_t a_nullable_int_value;
+  if (fl_value_get_type(value1) != FL_VALUE_TYPE_NULL) {
+    a_nullable_int_value = fl_value_get_int(value1);
+    a_nullable_int = &a_nullable_int_value;
+  }
+  FlValue* value2 = fl_value_get_list_value(message_, 2);
+  const gchar* a_nullable_string = fl_value_get_string(value2);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_send_multiple_nullable_types_without_recursion(
+      a_nullable_bool, a_nullable_int, a_nullable_string, handle,
+      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_bool == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  gboolean a_bool = fl_value_get_bool(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_bool(a_bool, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_int == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  int64_t an_int = fl_value_get_int(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_int(an_int, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_double == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  double a_double = fl_value_get_float(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_double(a_double, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_string == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const gchar* a_string = fl_value_get_string(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_string(a_string, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_uint8_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const uint8_t* list = fl_value_get_uint8_list(value0);
+  size_t list_length = fl_value_get_length(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_uint8_list(list, list_length, handle,
+                                             self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_list(list, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_enum_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_enum_list(enum_list, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_class_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_class_list(class_list, handle,
+                                             self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_enum_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_enum_list(enum_list, handle,
+                                                     self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_class_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_class_list(class_list, handle,
+                                                      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_map(map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_string_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_string_map(string_map, handle,
+                                             self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_int_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_int_map(int_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_enum_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_enum_map(enum_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_class_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_class_map(class_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_string_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_string_map(string_map, handle,
+                                                      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_int_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_int_map(int_map, handle,
+                                                   self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_enum_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_enum_map(enum_map, handle,
+                                                    self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_non_null_class_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_non_null_class_map(class_map, handle,
+                                                     self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnEnum an_enum = static_cast<CoreTestsPigeonTestAnEnum>(
+      fl_value_get_int(reinterpret_cast<FlValue*>(
+          const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_enum(an_enum, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_another_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnotherEnum another_enum =
+      static_cast<CoreTestsPigeonTestAnotherEnum>(
+          fl_value_get_int(reinterpret_cast<FlValue*>(
+              const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_another_enum(another_enum, handle,
+                                               self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_bool == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  gboolean* a_bool = nullptr;
+  gboolean a_bool_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_bool_value = fl_value_get_bool(value0);
+    a_bool = &a_bool_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_bool(a_bool, handle,
+                                                self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_int == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  int64_t* an_int = nullptr;
+  int64_t an_int_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    an_int_value = fl_value_get_int(value0);
+    an_int = &an_int_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_int(an_int, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_double == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  double* a_double = nullptr;
+  double a_double_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    a_double_value = fl_value_get_float(value0);
+    a_double = &a_double_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_double(a_double, handle,
+                                                  self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_string == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const gchar* a_string = fl_value_get_string(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_string(a_string, handle,
+                                                  self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_uint8_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const uint8_t* list = fl_value_get_uint8_list(value0);
+  size_t list_length = fl_value_get_length(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_uint8_list(list, list_length, handle,
+                                                      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_list(list, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_enum_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_enum_list(enum_list, handle,
+                                                     self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_class_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_class_list(class_list, handle,
+                                                      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_enum_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_enum_list(enum_list, handle,
+                                                              self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_class_list == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_list = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_class_list(
+      class_list, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_map(map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_string_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_string_map(string_map, handle,
+                                                      self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_int_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_int_map(int_map, handle,
+                                                   self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_enum_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_enum_map(enum_map, handle,
+                                                    self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_class_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_class_map(class_map, handle,
+                                                     self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_string_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* string_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_string_map(
+      string_map, handle, self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_int_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* int_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_int_map(int_map, handle,
+                                                            self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_enum_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* enum_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_enum_map(enum_map, handle,
+                                                             self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_non_null_class_map == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  FlValue* class_map = value0;
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_non_null_class_map(class_map, handle,
+                                                              self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_nullable_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnEnum* an_enum = nullptr;
+  CoreTestsPigeonTestAnEnum an_enum_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    an_enum_value = static_cast<CoreTestsPigeonTestAnEnum>(
+        fl_value_get_int(reinterpret_cast<FlValue*>(
+            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+    an_enum = &an_enum_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_nullable_enum(an_enum, handle,
+                                                self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_echo_another_nullable_enum == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  CoreTestsPigeonTestAnotherEnum* another_enum = nullptr;
+  CoreTestsPigeonTestAnotherEnum another_enum_value;
+  if (fl_value_get_type(value0) != FL_VALUE_TYPE_NULL) {
+    another_enum_value = static_cast<CoreTestsPigeonTestAnotherEnum>(
+        fl_value_get_int(reinterpret_cast<FlValue*>(
+            const_cast<gpointer>(fl_value_get_custom_value(value0)))));
+    another_enum = &another_enum_value;
+  }
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_echo_another_nullable_enum(another_enum, handle,
+                                                        self->user_data);
+}
+
+static void
+core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_cb(
+    FlBasicMessageChannel* channel, FlValue* message_,
+    FlBasicMessageChannelResponseHandle* response_handle, gpointer user_data) {
+  CoreTestsPigeonTestHostIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_HOST_INTEGRATION_CORE_API(user_data);
+
+  if (self->vtable == nullptr ||
+      self->vtable->call_flutter_small_api_echo_string == nullptr) {
+    return;
+  }
+
+  FlValue* value0 = fl_value_get_list_value(message_, 0);
+  const gchar* a_string = fl_value_get_string(value0);
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle) handle =
+      core_tests_pigeon_test_host_integration_core_api_response_handle_new(
+          channel, response_handle);
+  self->vtable->call_flutter_small_api_echo_string(a_string, handle,
+                                                   self->user_data);
+}
+
+void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
+    FlBinaryMessenger* messenger, const gchar* suffix,
+    const CoreTestsPigeonTestHostIntegrationCoreApiVTable* vtable,
+    gpointer user_data, GDestroyNotify user_data_free_func) {
+  g_autofree gchar* dot_suffix =
+      suffix != nullptr ? g_strdup_printf(".%s", suffix) : g_strdup("");
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApi) api_data =
+      core_tests_pigeon_test_host_integration_core_api_new(vtable, user_data,
+                                                           user_data_free_func);
+
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  g_autofree gchar* noop_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop%"
+      "s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) noop_channel = fl_basic_message_channel_new(
+      messenger, noop_channel_name, FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      noop_channel, core_tests_pigeon_test_host_integration_core_api_noop_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_all_types_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoAllTypes%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_all_types_channel =
+      fl_basic_message_channel_new(messenger, echo_all_types_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_all_types_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_all_types_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* throw_error_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "throwError%s",
@@ -14966,6 +17442,30 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       echo_class_list_channel,
       core_tests_pigeon_test_host_integration_core_api_echo_class_list_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_enum_list_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullEnumList%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_enum_list_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_enum_list_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_enum_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_class_list_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullClassList%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_class_list_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_class_list_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_class_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* echo_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoMap%s",
@@ -15021,6 +17521,54 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       echo_class_map_channel,
       core_tests_pigeon_test_host_integration_core_api_echo_class_map_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_string_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullStringMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_string_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_string_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_string_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_int_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullIntMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_int_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_int_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_int_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_enum_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullEnumMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_enum_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_enum_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_enum_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_non_null_class_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullClassMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_class_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_class_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_non_null_class_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* echo_class_wrapper_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoClassWrapper%s",
@@ -15272,6 +17820,32 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       echo_nullable_class_list_channel,
       core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_enum_list_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_enum_list_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_enum_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_class_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullClassList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_class_list_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_class_list_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_class_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* echo_nullable_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoNullableMap%s",
@@ -15331,6 +17905,58 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       echo_nullable_class_map_channel,
       core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_string_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullStringMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_string_map_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_string_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_string_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_int_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_nullable_non_null_int_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_int_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_enum_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_nullable_non_null_enum_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_enum_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* echo_nullable_non_null_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_class_map_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_class_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_class_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* echo_nullable_enum_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoNullableEnum%s",
@@ -16047,8 +18673,36 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
                                    call_flutter_echo_class_list_channel_name,
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
-      call_flutter_echo_class_list_channel,
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_cb,
+      call_flutter_echo_class_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_enum_list_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_enum_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_enum_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_class_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullClassList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_class_list_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_class_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_class_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_cb,
       g_object_ref(api_data), g_object_unref);
   g_autofree gchar* call_flutter_echo_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
@@ -16110,6 +18764,60 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       call_flutter_echo_class_map_channel,
       core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_string_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullStringMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_string_map_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_string_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_string_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) call_flutter_echo_non_null_int_map_channel =
+      fl_basic_message_channel_new(
+          messenger, call_flutter_echo_non_null_int_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_int_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) call_flutter_echo_non_null_enum_map_channel =
+      fl_basic_message_channel_new(
+          messenger, call_flutter_echo_non_null_enum_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_enum_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_non_null_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_class_map_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_class_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_class_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* call_flutter_echo_enum_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "callFlutterEchoEnum%s",
@@ -16242,6 +18950,38 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       call_flutter_echo_nullable_class_list_channel,
       core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_enum_list_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_enum_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_enum_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar*
+      call_flutter_echo_nullable_non_null_class_list_channel_name =
+          g_strdup_printf(
+              "dev.flutter.pigeon.pigeon_integration_tests."
+              "HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList%"
+              "s",
+              dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_class_list_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_class_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_class_list_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* call_flutter_echo_nullable_map_channel_name =
       g_strdup_printf(
           "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
@@ -16309,6 +19049,68 @@ void core_tests_pigeon_test_host_integration_core_api_set_method_handlers(
       call_flutter_echo_nullable_class_map_channel,
       core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_cb,
       g_object_ref(api_data), g_object_unref);
+  g_autofree gchar*
+      call_flutter_echo_nullable_non_null_string_map_channel_name =
+          g_strdup_printf(
+              "dev.flutter.pigeon.pigeon_integration_tests."
+              "HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap%"
+              "s",
+              dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_string_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_string_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_string_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_int_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_int_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_int_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_enum_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_enum_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_enum_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_cb,
+      g_object_ref(api_data), g_object_unref);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_class_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_class_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_class_map_channel,
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_cb,
+      g_object_ref(api_data), g_object_unref);
   g_autofree gchar* call_flutter_echo_nullable_enum_channel_name =
       g_strdup_printf(
           "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
@@ -16484,6 +19286,26 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(echo_class_list_channel, nullptr,
                                                nullptr, nullptr);
+  g_autofree gchar* echo_non_null_enum_list_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullEnumList%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_enum_list_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_enum_list_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_enum_list_channel,
+                                               nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_non_null_class_list_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullClassList%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_class_list_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_class_list_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_class_list_channel,
+                                               nullptr, nullptr, nullptr);
   g_autofree gchar* echo_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoMap%s",
@@ -16529,6 +19351,46 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(echo_class_map_channel, nullptr,
                                                nullptr, nullptr);
+  g_autofree gchar* echo_non_null_string_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullStringMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_string_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_string_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_string_map_channel,
+                                               nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_non_null_int_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullIntMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_int_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_int_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_int_map_channel,
+                                               nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_non_null_enum_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullEnumMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_enum_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_enum_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_enum_map_channel,
+                                               nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_non_null_class_map_channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+      "echoNonNullClassMap%s",
+      dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_non_null_class_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_non_null_class_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(echo_non_null_class_map_channel,
+                                               nullptr, nullptr, nullptr);
   g_autofree gchar* echo_class_wrapper_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoClassWrapper%s",
@@ -16740,6 +19602,28 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(echo_nullable_class_list_channel,
                                                nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_enum_list_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_enum_list_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_enum_list_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_class_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullClassList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_class_list_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_class_list_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_class_list_channel, nullptr, nullptr, nullptr);
   g_autofree gchar* echo_nullable_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoNullableMap%s",
@@ -16789,6 +19673,50 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(echo_nullable_class_map_channel,
                                                nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_string_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullStringMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_string_map_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_string_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_string_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_int_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_nullable_non_null_int_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_int_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_enum_map_channel =
+      fl_basic_message_channel_new(messenger,
+                                   echo_nullable_non_null_enum_map_channel_name,
+                                   FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_enum_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* echo_nullable_non_null_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "echoNullableNonNullClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) echo_nullable_non_null_class_map_channel =
+      fl_basic_message_channel_new(
+          messenger, echo_nullable_non_null_class_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      echo_nullable_non_null_class_map_channel, nullptr, nullptr, nullptr);
   g_autofree gchar* echo_nullable_enum_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "echoNullableEnum%s",
@@ -17395,6 +20323,30 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
       call_flutter_echo_class_list_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_enum_list_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_enum_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_enum_list_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_class_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullClassList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_class_list_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_class_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_class_list_channel, nullptr, nullptr, nullptr);
   g_autofree gchar* call_flutter_echo_map_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "callFlutterEchoMap%s",
@@ -17445,6 +20397,52 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
                                    FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
       call_flutter_echo_class_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_string_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullStringMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_string_map_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_string_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_string_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) call_flutter_echo_non_null_int_map_channel =
+      fl_basic_message_channel_new(
+          messenger, call_flutter_echo_non_null_int_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_int_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel) call_flutter_echo_non_null_enum_map_channel =
+      fl_basic_message_channel_new(
+          messenger, call_flutter_echo_non_null_enum_map_channel_name,
+          FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_enum_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_non_null_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNonNullClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_non_null_class_map_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_non_null_class_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_non_null_class_map_channel, nullptr, nullptr, nullptr);
   g_autofree gchar* call_flutter_echo_enum_channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
       "callFlutterEchoEnum%s",
@@ -17557,6 +20555,36 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
               FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
       call_flutter_echo_nullable_class_list_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_enum_list_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullEnumList%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_enum_list_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_enum_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_enum_list_channel, nullptr, nullptr,
+      nullptr);
+  g_autofree gchar*
+      call_flutter_echo_nullable_non_null_class_list_channel_name =
+          g_strdup_printf(
+              "dev.flutter.pigeon.pigeon_integration_tests."
+              "HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList%"
+              "s",
+              dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_class_list_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_class_list_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_class_list_channel, nullptr, nullptr,
+      nullptr);
   g_autofree gchar* call_flutter_echo_nullable_map_channel_name =
       g_strdup_printf(
           "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
@@ -17601,19 +20629,77 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
           messenger, call_flutter_echo_nullable_enum_map_channel_name,
           FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
-      call_flutter_echo_nullable_enum_map_channel, nullptr, nullptr, nullptr);
-  g_autofree gchar* call_flutter_echo_nullable_class_map_channel_name =
+      call_flutter_echo_nullable_enum_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar* call_flutter_echo_nullable_class_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableClassMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_class_map_channel =
+          fl_basic_message_channel_new(
+              messenger, call_flutter_echo_nullable_class_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_class_map_channel, nullptr, nullptr, nullptr);
+  g_autofree gchar*
+      call_flutter_echo_nullable_non_null_string_map_channel_name =
+          g_strdup_printf(
+              "dev.flutter.pigeon.pigeon_integration_tests."
+              "HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap%"
+              "s",
+              dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_string_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_string_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_string_map_channel, nullptr, nullptr,
+      nullptr);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_int_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullIntMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_int_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_int_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_int_map_channel, nullptr, nullptr,
+      nullptr);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_enum_map_channel_name =
+      g_strdup_printf(
+          "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+          "callFlutterEchoNullableNonNullEnumMap%s",
+          dot_suffix);
+  g_autoptr(FlBasicMessageChannel)
+      call_flutter_echo_nullable_non_null_enum_map_channel =
+          fl_basic_message_channel_new(
+              messenger,
+              call_flutter_echo_nullable_non_null_enum_map_channel_name,
+              FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_set_message_handler(
+      call_flutter_echo_nullable_non_null_enum_map_channel, nullptr, nullptr,
+      nullptr);
+  g_autofree gchar* call_flutter_echo_nullable_non_null_class_map_channel_name =
       g_strdup_printf(
           "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-          "callFlutterEchoNullableClassMap%s",
+          "callFlutterEchoNullableNonNullClassMap%s",
           dot_suffix);
   g_autoptr(FlBasicMessageChannel)
-      call_flutter_echo_nullable_class_map_channel =
+      call_flutter_echo_nullable_non_null_class_map_channel =
           fl_basic_message_channel_new(
-              messenger, call_flutter_echo_nullable_class_map_channel_name,
+              messenger,
+              call_flutter_echo_nullable_non_null_class_map_channel_name,
               FL_MESSAGE_CODEC(codec));
   fl_basic_message_channel_set_message_handler(
-      call_flutter_echo_nullable_class_map_channel, nullptr, nullptr, nullptr);
+      call_flutter_echo_nullable_non_null_class_map_channel, nullptr, nullptr,
+      nullptr);
   g_autofree gchar* call_flutter_echo_nullable_enum_channel_name =
       g_strdup_printf(
           "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
@@ -17651,2766 +20737,5165 @@ void core_tests_pigeon_test_host_integration_core_api_clear_method_handlers(
       call_flutter_small_api_echo_string_channel, nullptr, nullptr, nullptr);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_noop_async(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
+void core_tests_pigeon_test_host_integration_core_api_respond_noop_async(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_noop_async_response_new();
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "noopAsync", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_noop_async(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_noop_async_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "noopAsync", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    int64_t return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    double return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gboolean return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const uint8_t* return_value, size_t return_value_length) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new(
+              return_value, return_value_length);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_object(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncObject", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_object(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncObject", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnEnum return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_another_async_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnotherEnum return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherAsyncEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_another_async_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherAsyncEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_error_from_void(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new();
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncErrorFromVoid", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_error_from_void(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncErrorFromVoid", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_flutter_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncFlutterError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_flutter_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "throwAsyncFlutterError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_all_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllTypes* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new(
+          return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncAllTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_all_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncAllTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_all_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableAllNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_all_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableAllNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_all_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableAllNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_all_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableAllNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    int64_t* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    double* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gboolean* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const uint8_t* return_value, size_t return_value_length) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new(
+              return_value, return_value_length);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_object(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableObject", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_object(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableObject", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnEnum* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAsyncNullableEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_echo_another_async_nullable_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnotherEnum* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherAsyncNullableEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_another_async_nullable_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "echoAnotherAsyncNullableEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_noop(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new();
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterNoop", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_noop(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse) response =
+      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new_error(
+          code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterNoop", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_throw_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterThrowError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_throw_error(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterThrowError", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_throw_error_from_void(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new();
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterThrowErrorFromVoid", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_throw_error_from_void(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterThrowErrorFromVoid", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllTypes* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_send_multiple_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypes* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterSendMultipleNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_send_multiple_nullable_types(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterSendMultipleNullableTypes", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAllNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_send_multiple_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterSendMultipleNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_send_multiple_nullable_types_without_recursion(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterSendMultipleNullableTypesWithoutRecursion",
+              error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gboolean return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    int64_t return_value) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    double return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const uint8_t* return_value, size_t return_value_length) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new(
+              return_value, return_value_length);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_uint8_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoUint8List", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullEnumList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_list_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullClassList", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_string_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_int_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullIntMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_enum_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullEnumMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_non_null_class_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNonNullClassMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnEnum return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    CoreTestsPigeonTestAnotherEnum return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAnotherEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoAnotherEnum", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gboolean* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableBool", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    int64_t* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableInt", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    double* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableDouble", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_noop_async_response_new();
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "noopAsync", error->message);
+              "callFlutterEchoNullableDouble", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_noop_async(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableString", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiNoopAsyncResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_noop_async_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "noopAsync", error->message);
+              "callFlutterEchoNullableString", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_int(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_uint8_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    int64_t return_value) {
+    const uint8_t* return_value, size_t return_value_length) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new(
+              return_value, return_value_length);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncInt", error->message);
+              "callFlutterEchoNullableUint8List", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_int(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_uint8_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncInt", error->message);
+              "callFlutterEchoNullableUint8List", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_double(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    double return_value) {
+    FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncDouble", error->message);
+              "callFlutterEchoNullableList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_double(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncDoubleResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_double_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncDouble", error->message);
+              "callFlutterEchoNullableList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_bool(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    gboolean return_value) {
+    FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncBool", error->message);
+              "callFlutterEchoNullableEnumList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_bool(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncBoolResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_bool_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncBool", error->message);
+              "callFlutterEchoNullableEnumList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_string(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_class_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value) {
+    FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncString", error->message);
+              "callFlutterEchoNullableClassList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_string(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_class_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_string_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncString", error->message);
+              "callFlutterEchoNullableClassList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_uint8_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const uint8_t* return_value, size_t return_value_length) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse)
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new(
-              return_value, return_value_length);
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncUint8List", error->message);
+              "callFlutterEchoNullableNonNullEnumList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_uint8_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncUint8ListResponse)
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumListResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_uint8_list_response_new_error(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_list_response_new_error(
               code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncUint8List", error->message);
+              "callFlutterEchoNullableNonNullEnumList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_object(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncObject", error->message);
+              "callFlutterEchoNullableNonNullClassList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_object(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_list(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncObjectResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_object_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_list_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncObject", error->message);
+              "callFlutterEchoNullableNonNullClassList", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new(
+              return_value);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new_error(
+              code, message, details);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_basic_message_channel_respond(response_handle->channel,
+                                        response_handle->response_handle,
+                                        response->value, &error)) {
+    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
+              "callFlutterEchoNullableStringMap", error->message);
+  }
+}
+
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value) {
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncList", error->message);
+              "callFlutterEchoNullableIntMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncListResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_list_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncList", error->message);
+              "callFlutterEchoNullableIntMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnumList", error->message);
+              "callFlutterEchoNullableEnumMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumListResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_list_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnumList", error->message);
+              "callFlutterEchoNullableEnumMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_class_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse)
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new(
               return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncClassList", error->message);
+              "callFlutterEchoNullableClassMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_class_list(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassListResponse)
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_class_list_response_new_error(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new_error(
               code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncClassList", error->message);
+              "callFlutterEchoNullableClassMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_string_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncMap", error->message);
+              "callFlutterEchoNullableNonNullStringMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_string_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_map_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_string_map_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncMap", error->message);
+              "callFlutterEchoNullableNonNullStringMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_string_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_int_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse)
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_new(
               return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncStringMap", error->message);
+              "callFlutterEchoNullableNonNullIntMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_string_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_int_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncStringMapResponse)
+  g_autoptr(
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullIntMapResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_string_map_response_new_error(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_int_map_response_new_error(
               code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncStringMap", error->message);
+              "callFlutterEchoNullableNonNullIntMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_int_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncIntMap", error->message);
+              "callFlutterEchoNullableNonNullEnumMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_int_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncIntMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_int_map_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_enum_map_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncIntMap", error->message);
+              "callFlutterEchoNullableNonNullEnumMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     FlValue* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnumMap", error->message);
+              "callFlutterEchoNullableNonNullClassMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_map_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_non_null_class_map_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnumMap", error->message);
+              "callFlutterEchoNullableNonNullClassMap", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_class_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
+    CoreTestsPigeonTestAnEnum* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncClassMap", error->message);
+              "callFlutterEchoNullableEnum", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_class_map(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncClassMapResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_class_map_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncClassMap", error->message);
+              "callFlutterEchoNullableEnum", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_nullable_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnEnum return_value) {
+    CoreTestsPigeonTestAnotherEnum* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new(
-          return_value);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new(
+              return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnum", error->message);
+              "callFlutterEchoAnotherNullableEnum", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_nullable_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncEnumResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_enum_response_new_error(
-          code, message, details);
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse)
+      response =
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new_error(
+              code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncEnum", error->message);
+              "callFlutterEchoAnotherNullableEnum", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_another_async_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_small_api_echo_string(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnotherEnum return_value) {
+    const gchar* return_value) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse)
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new(
               return_value);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherAsyncEnum", error->message);
+              "callFlutterSmallApiEchoString", error->message);
   }
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_another_async_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_small_api_echo_string(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details) {
   g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncEnumResponse)
+      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse)
       response =
-          core_tests_pigeon_test_host_integration_core_api_echo_another_async_enum_response_new_error(
+          core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new_error(
               code, message, details);
   g_autoptr(GError) error = nullptr;
   if (!fl_basic_message_channel_respond(response_handle->channel,
                                         response_handle->response_handle,
                                         response->value, &error)) {
     g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherAsyncEnum", error->message);
+              "callFlutterSmallApiEchoString", error->message);
+  }
+}
+
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApi {
+  GObject parent_instance;
+
+  FlBinaryMessenger* messenger;
+  gchar* suffix;
+};
+
+G_DEFINE_TYPE(CoreTestsPigeonTestFlutterIntegrationCoreApi,
+              core_tests_pigeon_test_flutter_integration_core_api,
+              G_TYPE_OBJECT)
+
+static void core_tests_pigeon_test_flutter_integration_core_api_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object);
+  g_clear_object(&self->messenger);
+  g_clear_pointer(&self->suffix, g_free);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_parent_class)
+      ->dispose(object);
+}
+
+static void core_tests_pigeon_test_flutter_integration_core_api_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self) {}
+
+static void core_tests_pigeon_test_flutter_integration_core_api_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_dispose;
+}
+
+CoreTestsPigeonTestFlutterIntegrationCoreApi*
+core_tests_pigeon_test_flutter_integration_core_api_new(
+    FlBinaryMessenger* messenger, const gchar* suffix) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApi* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(g_object_new(
+          core_tests_pigeon_test_flutter_integration_core_api_get_type(),
+          nullptr));
+  self->messenger = FL_BINARY_MESSENGER(g_object_ref(messenger));
+  self->suffix =
+      suffix != nullptr ? g_strdup_printf(".%s", suffix) : g_strdup("");
+  return self;
+}
+
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+};
+
+G_DEFINE_TYPE(CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse,
+              core_tests_pigeon_test_flutter_integration_core_api_noop_response,
+              G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_noop_response_parent_class)
+      ->dispose(object);
+}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponseClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_noop_response_dispose;
+}
+
+static CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse*
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(g_object_new(
+          core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_type(),
+          nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new(
-          return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncError", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_throw_async_error_response_new_error(
-          code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncError", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_error_from_void(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new();
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncErrorFromVoid", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_error_from_void(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncErrorFromVoidResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_throw_async_error_from_void_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncErrorFromVoid", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_throw_async_flutter_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncFlutterError", error->message);
-  }
+static void core_tests_pigeon_test_flutter_integration_core_api_noop_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_throw_async_flutter_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiThrowAsyncFlutterErrorResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_throw_async_flutter_error_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "throwAsyncFlutterError", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_noop(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "noop%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_noop_cb, task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_all_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllTypes* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new(
-          return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncAllTypes", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse*
+core_tests_pigeon_test_flutter_integration_core_api_noop_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_noop_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_all_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncAllTypesResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_echo_async_all_types_response_new_error(
-          code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncAllTypes", error->message);
-  }
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_throw_error_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_all_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableAllNullableTypes", error->message);
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_dispose;
+}
+
+static CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_all_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableAllNullableTypes", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_all_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableAllNullableTypesWithoutRecursion",
-              error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_all_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableAllNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_all_nullable_types_without_recursion_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableAllNullableTypesWithoutRecursion",
-              error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    int64_t* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableInt", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableInt", error->message);
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+          self));
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
   }
+  return self->return_value;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    double* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableDouble", error->message);
-  }
+static void core_tests_pigeon_test_flutter_integration_core_api_throw_error_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_double_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableDouble", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_throw_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "throwError%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_cb, task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    gboolean* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableBool", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_bool_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableBool", error->message);
-  }
-}
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse {
+  GObject parent_instance;
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableString", error->message);
-  }
+  FlValue* error;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableString", error->message);
-  }
-}
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+        self) {}
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const uint8_t* return_value, size_t return_value_length) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new(
-              return_value, return_value_length);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableUint8List", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_uint8_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableUint8List", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_object(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableObject", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_object(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableObjectResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_object_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableObject", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableList", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableList", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnumList", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnumList", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "throwErrorFromVoid%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableClassList", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
+core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableClassList", error->message);
-  }
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableMap", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableMap", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableStringMap", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_string_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableStringMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableIntMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_int_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableIntMap", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnumMap", error->message);
-  }
+CoreTestsPigeonTestAllTypes*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+          self));
+  return CORE_TESTS_PIGEON_TEST_ALL_TYPES(
+      fl_value_get_custom_value_object(self->return_value));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnumMap", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
+}
+
+void core_tests_pigeon_test_flutter_integration_core_api_echo_all_types(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    CoreTestsPigeonTestAllTypes* everything, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args,
+                       fl_value_new_custom_object(132, G_OBJECT(everything)));
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoAllTypes%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableClassMap", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_class_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableClassMap", error->message);
-  }
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_async_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnEnum* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnum", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_async_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAsyncNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_async_nullable_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAsyncNullableEnum", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_echo_another_async_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnotherEnum* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherAsyncNullableEnum", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_echo_another_async_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherAsyncNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_echo_another_async_nullable_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "echoAnotherAsyncNullableEnum", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_noop(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new();
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterNoop", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_noop(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterNoopResponse) response =
-      core_tests_pigeon_test_host_integration_core_api_call_flutter_noop_response_new_error(
-          code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterNoop", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_throw_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterThrowError", error->message);
+CoreTestsPigeonTestAllNullableTypes*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+          self));
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
   }
+  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
+      fl_value_get_custom_value_object(self->return_value));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_throw_error(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterThrowError", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_throw_error_from_void(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new();
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterThrowErrorFromVoid", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    CoreTestsPigeonTestAllNullableTypes* everything, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(
+      args, everything != nullptr
+                ? fl_value_new_custom_object(133, G_OBJECT(everything))
+                : fl_value_new_null());
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoAllNullableTypes%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_throw_error_from_void(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterThrowErrorFromVoidResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_throw_error_from_void_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterThrowErrorFromVoid", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllTypes* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllTypes", error->message);
-  }
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+              object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_types_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllTypes", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllNullableTypes", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllNullableTypes", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_send_multiple_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypes* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSendMultipleNullableTypes", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_send_multiple_nullable_types(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSendMultipleNullableTypes", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_all_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllNullableTypesWithoutRecursion",
-              error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_all_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAllNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_all_nullable_types_without_recursion_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAllNullableTypesWithoutRecursion",
-              error->message);
-  }
+CoreTestsPigeonTestAllNullableTypes*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+          self));
+  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
+      fl_value_get_custom_value_object(self->return_value));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_send_multiple_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSendMultipleNullableTypesWithoutRecursion",
-              error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_send_multiple_nullable_types_without_recursion(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSendMultipleNullableTypesWithoutRecursionResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_send_multiple_nullable_types_without_recursion_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSendMultipleNullableTypesWithoutRecursion",
-              error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    gboolean* a_nullable_bool, int64_t* a_nullable_int,
+    const gchar* a_nullable_string, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, a_nullable_bool != nullptr
+                                 ? fl_value_new_bool(*a_nullable_bool)
+                                 : fl_value_new_null());
+  fl_value_append_take(args, a_nullable_int != nullptr
+                                 ? fl_value_new_int(*a_nullable_int)
+                                 : fl_value_new_null());
+  fl_value_append_take(args, a_nullable_string != nullptr
+                                 ? fl_value_new_string(a_nullable_string)
+                                 : fl_value_new_null());
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "sendMultipleNullableTypes%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    gboolean return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoBool", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_bool_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoBool", error->message);
-  }
-}
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse {
+  GObject parent_instance;
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    int64_t return_value) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoInt", error->message);
-  }
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+              object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoInt", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    double return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoDouble", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_double_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoDouble", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoString", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoString", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const uint8_t* return_value, size_t return_value_length) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new(
-              return_value, return_value_length);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoUint8List", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_uint8_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoUint8List", error->message);
+CoreTestsPigeonTestAllNullableTypesWithoutRecursion*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+          self));
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
   }
+  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
+      fl_value_get_custom_value_object(self->return_value));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoList", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoList", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(
+      args, everything != nullptr
+                ? fl_value_new_custom_object(134, G_OBJECT(everything))
+                : fl_value_new_null());
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoAllNullableTypesWithoutRecursion%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnumList", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnumList", error->message);
-  }
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+              object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoClassList", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoClassList", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoMap", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoStringMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_string_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoStringMap", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoIntMap", error->message);
-  }
+CoreTestsPigeonTestAllNullableTypesWithoutRecursion*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+        self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+          self));
+  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
+      fl_value_get_custom_value_object(self->return_value));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_int_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoIntMap", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnumMap", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    gboolean* a_nullable_bool, int64_t* a_nullable_int,
+    const gchar* a_nullable_string, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, a_nullable_bool != nullptr
+                                 ? fl_value_new_bool(*a_nullable_bool)
+                                 : fl_value_new_null());
+  fl_value_append_take(args, a_nullable_int != nullptr
+                                 ? fl_value_new_int(*a_nullable_int)
+                                 : fl_value_new_null());
+  fl_value_append_take(args, a_nullable_string != nullptr
+                                 ? fl_value_new_string(a_nullable_string)
+                                 : fl_value_new_null());
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "sendMultipleNullableTypesWithoutRecursion%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_cb,
+      task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnumMap", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
+core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoClassMap", error->message);
-  }
-}
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse {
+  GObject parent_instance;
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_class_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoClassMap", error->message);
-  }
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnEnum return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnum", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponseClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoEnum", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnotherEnum return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAnotherEnum", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAnotherEnum", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    gboolean* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableBool", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableBoolResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_bool_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableBool", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    int64_t* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableInt", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+          self),
+      FALSE);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+          self));
+  return fl_value_get_bool(self->return_value);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableInt", error->message);
-  }
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_bool_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    double* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableDouble", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_echo_bool(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, gboolean a_bool,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_bool(a_bool));
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoBool%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_cb, task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableDoubleResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_double_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableDouble", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_bool_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableString", error->message);
-  }
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_int_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableString", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponseClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const uint8_t* return_value, size_t return_value_length) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new(
-              return_value, return_value_length);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableUint8List", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_uint8_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableUint8ListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_uint8_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableUint8List", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableList", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableList", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
+}
+
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnumList", error->message);
-  }
+int64_t
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+          self),
+      0);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+          self));
+  return fl_value_get_int(self->return_value);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnumList", error->message);
-  }
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_int_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableClassList", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_echo_int(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, int64_t an_int,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_int(an_int));
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoInt%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_cb, task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_class_list(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassListResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_list_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableClassList", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableMap", error->message);
-  }
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse {
+  GObject parent_instance;
+
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_double_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableMap", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableStringMap", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableStringMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_string_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableStringMap", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableIntMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableIntMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_int_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableIntMap", error->message);
-  }
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnumMap", error->message);
-  }
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnumMap", error->message);
-  }
+double
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+          self),
+      0.0);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+          self));
+  return fl_value_get_float(self->return_value);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    FlValue* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableClassMap", error->message);
-  }
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_double_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_class_map(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableClassMapResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_class_map_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableClassMap", error->message);
-  }
+void core_tests_pigeon_test_flutter_integration_core_api_echo_double(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, double a_double,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_float(a_double));
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoDouble%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_double_cb, task);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnEnum* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnum", error->message);
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_double_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
   }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_new(
+      response);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_nullable_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoNullableEnum", error->message);
-  }
-}
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse {
+  GObject parent_instance;
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnotherEnum* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAnotherNullableEnum", error->message);
-  }
+  FlValue* error;
+  FlValue* return_value;
+};
+
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_string_response,
+    G_TYPE_OBJECT)
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_dispose(
+    GObject* object) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          object);
+  g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
+  G_OBJECT_CLASS(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_parent_class)
+      ->dispose(object);
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_nullable_enum(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterEchoAnotherNullableEnumResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_echo_another_nullable_enum_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterEchoAnotherNullableEnum", error->message);
-  }
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponseClass*
+        klass) {
+  G_OBJECT_CLASS(klass)->dispose =
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_dispose;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_small_api_echo_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new(
-              return_value);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSmallApiEchoString", error->message);
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_new(
+    FlValue* response) {
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_type(),
+              nullptr));
+  if (fl_value_get_length(response) > 1) {
+    self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
+  return self;
 }
 
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_small_api_echo_string(
-    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* code, const gchar* message, FlValue* details) {
-  g_autoptr(
-      CoreTestsPigeonTestHostIntegrationCoreApiCallFlutterSmallApiEchoStringResponse)
-      response =
-          core_tests_pigeon_test_host_integration_core_api_call_flutter_small_api_echo_string_response_new_error(
-              code, message, details);
-  g_autoptr(GError) error = nullptr;
-  if (!fl_basic_message_channel_respond(response_handle->channel,
-                                        response_handle->response_handle,
-                                        response->value, &error)) {
-    g_warning("Failed to send response to %s.%s: %s", "HostIntegrationCoreApi",
-              "callFlutterSmallApiEchoString", error->message);
-  }
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          self),
+      FALSE);
+  return self->error != nullptr;
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApi {
-  GObject parent_instance;
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 0));
+}
 
-  FlBinaryMessenger* messenger;
-  gchar* suffix;
-};
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+          self));
+  return fl_value_get_string(fl_value_get_list_value(self->error, 1));
+}
 
-G_DEFINE_TYPE(CoreTestsPigeonTestFlutterIntegrationCoreApi,
-              core_tests_pigeon_test_flutter_integration_core_api,
-              G_TYPE_OBJECT)
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+          self));
+  return fl_value_get_list_value(self->error, 2);
+}
 
-static void core_tests_pigeon_test_flutter_integration_core_api_dispose(
-    GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object);
-  g_clear_object(&self->messenger);
-  g_clear_pointer(&self->suffix, g_free);
-  G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_parent_class)
-      ->dispose(object);
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+          self));
+  return fl_value_get_string(self->return_value);
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self) {}
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_string_cb(
+    GObject* object, GAsyncResult* result, gpointer user_data) {
+  GTask* task = G_TASK(user_data);
+  g_task_return_pointer(task, result, g_object_unref);
+}
 
-static void core_tests_pigeon_test_flutter_integration_core_api_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiClass* klass) {
-  G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_dispose;
+void core_tests_pigeon_test_flutter_integration_core_api_echo_string(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const gchar* a_string,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_string(a_string));
+  g_autofree gchar* channel_name = g_strdup_printf(
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoString%s",
+      self->suffix);
+  g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
+      core_tests_pigeon_test_message_codec_new();
+  FlBasicMessageChannel* channel = fl_basic_message_channel_new(
+      self->messenger, channel_name, FL_MESSAGE_CODEC(codec));
+  GTask* task = g_task_new(self, cancellable, callback, user_data);
+  g_task_set_task_data(task, channel, g_object_unref);
+  fl_basic_message_channel_send(
+      channel, args, cancellable,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_cb, task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApi*
-core_tests_pigeon_test_flutter_integration_core_api_new(
-    FlBinaryMessenger* messenger, const gchar* suffix) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApi* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(g_object_new(
-          core_tests_pigeon_test_flutter_integration_core_api_get_type(),
-          nullptr));
-  self->messenger = FL_BINARY_MESSENGER(g_object_ref(messenger));
-  self->suffix =
-      suffix != nullptr ? g_strdup_printf(".%s", suffix) : g_strdup("");
-  return self;
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
+    GError** error) {
+  g_autoptr(GTask) task = G_TASK(result);
+  GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
+  FlBasicMessageChannel* channel =
+      FL_BASIC_MESSAGE_CHANNEL(g_task_get_task_data(task));
+  g_autoptr(FlValue) response =
+      fl_basic_message_channel_send_finish(channel, r, error);
+  if (response == nullptr) {
+    return nullptr;
+  }
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_new(
+      response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse {
   GObject parent_instance;
 
   FlValue* error;
+  FlValue* return_value;
 };
 
-G_DEFINE_TYPE(CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse,
-              core_tests_pigeon_test_flutter_integration_core_api_noop_response,
-              G_TYPE_OBJECT)
+G_DEFINE_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response,
+    G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+          object);
   g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_noop_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_noop_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse*
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(g_object_new(
-          core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_type(),
-          nullptr));
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+          g_object_new(
+              core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_type(),
+              nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
   return self;
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_noop_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_NOOP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_noop_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_noop_cb(
+const uint8_t*
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self,
+    size_t* return_value_length) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+          self));
+  if (return_value_length != nullptr) {
+    *return_value_length = fl_value_get_length(self->return_value);
+  }
+  return fl_value_get_uint8_list(self->return_value);
+}
+
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
-
-void core_tests_pigeon_test_flutter_integration_core_api_noop(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    GCancellable* cancellable, GAsyncReadyCallback callback,
+
+void core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const uint8_t* list,
+    size_t list_length, GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_uint8_list(list, list_length));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "noop%s",
+      "echoUint8List%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -20420,11 +25905,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_noop(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_noop_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiNoopResponse*
-core_tests_pigeon_test_flutter_integration_core_api_noop_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -20436,11 +25922,11 @@ core_tests_pigeon_test_flutter_integration_core_api_noop_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_noop_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -20448,42 +25934,41 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_throw_error_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponseClass*
-        klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -20495,84 +25980,82 @@ core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
           self));
-  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
-    return nullptr;
-  }
   return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_throw_error_cb(
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_throw_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_ref(list));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "throwError%s",
+      "echoList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -20582,11 +26065,11 @@ void core_tests_pigeon_test_flutter_integration_core_api_throw_error(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_list_cb, task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorResponse*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -20598,128 +26081,142 @@ core_tests_pigeon_test_flutter_integration_core_api_throw_error_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_throw_error_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse {
   GObject parent_instance;
 
   FlValue* error;
+  FlValue* return_value;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
+  g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-        self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
+  } else {
+    FlValue* value = fl_value_get_list_value(response, 0);
+    self->return_value = fl_value_ref(value);
   }
   return self;
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_THROW_ERROR_FROM_VOID_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+          self),
+      nullptr);
+  g_assert(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+          self));
+  return self->return_value;
+}
+
 static void
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_ref(enum_list));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "throwErrorFromVoid%s",
+      "echoEnumList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -20729,12 +26226,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiThrowErrorFromVoidResponse*
-core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -20746,11 +26243,11 @@ core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_finish
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_throw_error_from_void_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -20758,42 +26255,42 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -20805,85 +26302,83 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAllTypes*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
           self));
-  return CORE_TESTS_PIGEON_TEST_ALL_TYPES(
-      fl_value_get_custom_value_object(self->return_value));
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_all_types(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    CoreTestsPigeonTestAllTypes* everything, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args,
-                       fl_value_new_custom_object(132, G_OBJECT(everything)));
+  fl_value_append_take(args, fl_value_ref(class_list));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoAllTypes%s",
+      "echoClassList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -20893,12 +26388,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_all_types(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -20910,12 +26405,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_types_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -20923,43 +26418,43 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -20971,95 +26466,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_resp
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAllNullableTypes*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
           self));
-  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
-    return nullptr;
-  }
-  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
-      fl_value_get_custom_value_object(self->return_value));
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    CoreTestsPigeonTestAllNullableTypes* everything, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(
-      args, everything != nullptr
-                ? fl_value_new_custom_object(133, G_OBJECT(everything))
-                : fl_value_new_null());
+  fl_value_append_take(args, fl_value_ref(enum_list));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoAllNullableTypes%s",
+      "echoNonNullEnumList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21069,12 +26557,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21086,12 +26574,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_fini
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21099,44 +26587,43 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
-              object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
+          object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -21148,98 +26635,88 @@ core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAllNullableTypes*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
           self));
-  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(
-      fl_value_get_custom_value_object(self->return_value));
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    gboolean* a_nullable_bool, int64_t* a_nullable_int,
-    const gchar* a_nullable_string, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, a_nullable_bool != nullptr
-                                 ? fl_value_new_bool(*a_nullable_bool)
-                                 : fl_value_new_null());
-  fl_value_append_take(args, a_nullable_int != nullptr
-                                 ? fl_value_new_int(*a_nullable_int)
-                                 : fl_value_new_null());
-  fl_value_append_take(args, a_nullable_string != nullptr
-                                 ? fl_value_new_string(a_nullable_string)
-                                 : fl_value_new_null());
+  fl_value_append_take(args, fl_value_ref(class_list));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "sendMultipleNullableTypes%s",
+      "echoNonNullClassList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21249,12 +26726,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesResponse*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21266,12 +26743,11 @@ core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_new(
       response);
 }
 
-struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21279,44 +26755,41 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
-              object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponseClass*
-        klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -21328,96 +26801,82 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_with
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAllNullableTypesWithoutRecursion*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-        self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ALL_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
           self));
-  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
-    return nullptr;
-  }
-  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
-      fl_value_get_custom_value_object(self->return_value));
+  return self->return_value;
 }
 
-static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_cb(
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* everything,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(
-      args, everything != nullptr
-                ? fl_value_new_custom_object(134, G_OBJECT(everything))
-                : fl_value_new_null());
+  fl_value_append_take(args, fl_value_ref(map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoAllNullableTypesWithoutRecursion%s",
+      "echoMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21427,12 +26886,11 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_cb,
-      task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_map_cb, task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAllNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21444,12 +26902,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_with
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_all_nullable_types_without_recursion_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_new(
       response);
 }
 
-struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21457,44 +26914,42 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-      self =
-          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
-              object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+          object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -21506,98 +26961,83 @@ core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAllNullableTypesWithoutRecursion*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-        self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_SEND_MULTIPLE_NULLABLE_TYPES_WITHOUT_RECURSION_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
           self));
-  return CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(
-      fl_value_get_custom_value_object(self->return_value));
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    gboolean* a_nullable_bool, int64_t* a_nullable_int,
-    const gchar* a_nullable_string, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_string_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* string_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, a_nullable_bool != nullptr
-                                 ? fl_value_new_bool(*a_nullable_bool)
-                                 : fl_value_new_null());
-  fl_value_append_take(args, a_nullable_int != nullptr
-                                 ? fl_value_new_int(*a_nullable_int)
-                                 : fl_value_new_null());
-  fl_value_append_take(args, a_nullable_string != nullptr
-                                 ? fl_value_new_string(a_nullable_string)
-                                 : fl_value_new_null());
+  fl_value_append_take(args, fl_value_ref(string_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "sendMultipleNullableTypesWithoutRecursion%s",
+      "echoStringMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21607,12 +27047,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiSendMultipleNullableTypesWithoutRecursionResponse*
-core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21624,11 +27064,11 @@ core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21636,41 +27076,42 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -21682,82 +27123,82 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
           self),
-      FALSE);
+      nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
           self));
-  return fl_value_get_bool(self->return_value);
+  return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_bool_cb(
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_bool(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, gboolean a_bool,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* int_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_new_bool(a_bool));
+  fl_value_append_take(args, fl_value_ref(int_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoBool%s",
+      "echoIntMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21767,11 +27208,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_bool(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_bool_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoBoolResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_bool_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21783,11 +27225,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_bool_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_bool_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21795,41 +27237,42 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_int_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -21841,82 +27284,83 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-int64_t
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
           self),
-      0);
+      nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
           self));
-  return fl_value_get_int(self->return_value);
+  return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_int_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_int(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, int64_t an_int,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_new_int(an_int));
+  fl_value_append_take(args, fl_value_ref(enum_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoInt%s",
+      "echoEnumMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -21926,11 +27370,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_int(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -21942,11 +27387,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_int_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_int_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -21954,42 +27399,42 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_double_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22001,82 +27446,83 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-double
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
           self),
-      0.0);
+      nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
           self));
-  return fl_value_get_float(self->return_value);
+  return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_double_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_double(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, double a_double,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_class_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_new_float(a_double));
+  fl_value_append_take(args, fl_value_ref(class_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoDouble%s",
+      "echoClassMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22086,11 +27532,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_double(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_double_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoDoubleResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_double_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22102,11 +27549,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_double_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_double_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22114,42 +27562,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_string_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22161,82 +27610,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
           self));
-  return fl_value_get_string(self->return_value);
+  return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_string_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_string(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const gchar* a_string,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* string_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_new_string(a_string));
+  fl_value_append_take(args, fl_value_ref(string_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoString%s",
+      "echoNonNullStringMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22246,11 +27701,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_string(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22262,11 +27718,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_string_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_string_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22274,42 +27730,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22321,87 +27778,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_new
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-const uint8_t*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse* self,
-    size_t* return_value_length) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
           self));
-  if (return_value_length != nullptr) {
-    *return_value_length = fl_value_get_length(self->return_value);
-  }
-  return fl_value_get_uint8_list(self->return_value);
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const uint8_t* list,
-    size_t list_length, GCancellable* cancellable, GAsyncReadyCallback callback,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* int_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_new_uint8_list(list, list_length));
+  fl_value_append_take(args, fl_value_ref(int_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoUint8List%s",
+      "echoNonNullIntMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22411,12 +27869,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoUint8ListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22428,11 +27886,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_uint8_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22440,41 +27898,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22486,82 +27946,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
           self));
   return self->return_value;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_list_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(list));
+  fl_value_append_take(args, fl_value_ref(enum_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoList%s",
+      "echoNonNullEnumMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22571,11 +28037,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_list(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_list_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22587,11 +28054,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_list_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22599,42 +28067,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22646,83 +28115,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
           self));
   return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(enum_list));
+  fl_value_append_take(args, fl_value_ref(class_map));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoEnumList%s",
+      "echoNonNullClassMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22732,12 +28206,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22749,11 +28223,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22761,42 +28235,41 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponseClass*
-        klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponseClass* klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22808,83 +28281,86 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_new
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse* self) {
+CoreTestsPigeonTestAnEnum
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
           self),
-      nullptr);
+      static_cast<CoreTestsPigeonTestAnEnum>(0));
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
           self));
-  return self->return_value;
+  return static_cast<CoreTestsPigeonTestAnEnum>(
+      fl_value_get_int(reinterpret_cast<FlValue*>(const_cast<gpointer>(
+          fl_value_get_custom_value(self->return_value)))));
 }
 
-static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_cb(
+static void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_class_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
-    GCancellable* cancellable, GAsyncReadyCallback callback,
-    gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_enum(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    CoreTestsPigeonTestAnEnum an_enum, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(class_list));
+  fl_value_append_take(args,
+                       fl_value_new_custom(129, fl_value_new_int(an_enum),
+                                           (GDestroyNotify)fl_value_unref));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoClassList%s",
+      "echoEnum%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -22894,12 +28370,11 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_class_list(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_cb,
-      task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_cb, task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -22911,11 +28386,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -22923,41 +28398,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -22969,82 +28446,87 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* self) {
+CoreTestsPigeonTestAnotherEnum
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
           self),
-      nullptr);
+      static_cast<CoreTestsPigeonTestAnotherEnum>(0));
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
           self));
-  return self->return_value;
+  return static_cast<CoreTestsPigeonTestAnotherEnum>(
+      fl_value_get_int(reinterpret_cast<FlValue*>(const_cast<gpointer>(
+          fl_value_get_custom_value(self->return_value)))));
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_map_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* map,
-    GCancellable* cancellable, GAsyncReadyCallback callback,
-    gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
+    CoreTestsPigeonTestAnotherEnum another_enum, GCancellable* cancellable,
+    GAsyncReadyCallback callback, gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(map));
+  fl_value_append_take(args,
+                       fl_value_new_custom(130, fl_value_new_int(another_enum),
+                                           (GDestroyNotify)fl_value_unref));
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoMap%s",
+      "echoAnotherEnum%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23054,11 +28536,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_map_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23070,54 +28553,56 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
+  gboolean return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23129,83 +28614,93 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_new
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse* self) {
+gboolean*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
           self));
-  return self->return_value;
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  self->return_value_ = fl_value_get_bool(self->return_value);
+  return &self->return_value_;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_string_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* string_map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, gboolean* a_bool,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(string_map));
+  fl_value_append_take(args, a_bool != nullptr ? fl_value_new_bool(*a_bool)
+                                               : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoStringMap%s",
+      "echoNullableBool%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23215,12 +28710,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_string_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23232,54 +28727,56 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
+  int64_t return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23291,82 +28788,88 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse* self) {
+int64_t*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
           self));
-  return self->return_value;
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  self->return_value_ = fl_value_get_int(self->return_value);
+  return &self->return_value_;
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* int_map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, int64_t* an_int,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(int_map));
+  fl_value_append_take(args, an_int != nullptr ? fl_value_new_int(*an_int)
+                                               : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoIntMap%s",
+      "echoNullableInt%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23376,12 +28879,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23393,54 +28896,56 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
+  double return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23452,83 +28957,93 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse* self) {
+double*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
           self));
-  return self->return_value;
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  self->return_value_ = fl_value_get_float(self->return_value);
+  return &self->return_value_;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, double* a_double,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(enum_map));
+  fl_value_append_take(args, a_double != nullptr ? fl_value_new_float(*a_double)
+                                                 : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoEnumMap%s",
+      "echoNullableDouble%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23538,12 +29053,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23555,11 +29070,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -23567,42 +29082,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23614,83 +29130,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* self) {
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
           self));
-  return self->return_value;
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  return fl_value_get_string(self->return_value);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_class_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const gchar* a_string,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, fl_value_ref(class_map));
+  fl_value_append_take(args, a_string != nullptr ? fl_value_new_string(a_string)
+                                                 : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoClassMap%s",
+      "echoNullableString%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23700,12 +29225,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_class_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23717,11 +29242,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -23729,41 +29255,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponseClass* klass) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponseClass*
+        klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23775,86 +29303,97 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_new(
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAnEnum
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* self) {
+const uint8_t*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        self,
+    size_t* return_value_length) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
           self),
-      static_cast<CoreTestsPigeonTestAnEnum>(0));
+      nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
           self));
-  return static_cast<CoreTestsPigeonTestAnEnum>(
-      fl_value_get_int(reinterpret_cast<FlValue*>(const_cast<gpointer>(
-          fl_value_get_custom_value(self->return_value)))));
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  if (return_value_length != nullptr) {
+    *return_value_length = fl_value_get_length(self->return_value);
+  }
+  return fl_value_get_uint8_list(self->return_value);
 }
 
-static void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_cb(
+static void
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_enum(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    CoreTestsPigeonTestAnEnum an_enum, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const uint8_t* list,
+    size_t list_length, GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args,
-                       fl_value_new_custom(129, fl_value_new_int(an_enum),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(args, list != nullptr
+                                 ? fl_value_new_uint8_list(list, list_length)
+                                 : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoEnum%s",
+      "echoNullableUint8List%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -23864,11 +29403,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_enum(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_enum_cb, task);
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_cb,
+      task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -23880,11 +29420,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -23892,43 +29432,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
-}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -23940,87 +29480,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_n
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-CoreTestsPigeonTestAnotherEnum
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
           self),
-      static_cast<CoreTestsPigeonTestAnotherEnum>(0));
+      nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
           self));
-  return static_cast<CoreTestsPigeonTestAnotherEnum>(
-      fl_value_get_int(reinterpret_cast<FlValue*>(const_cast<gpointer>(
-          fl_value_get_custom_value(self->return_value)))));
+  if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
+    return nullptr;
+  }
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self,
-    CoreTestsPigeonTestAnotherEnum another_enum, GCancellable* cancellable,
-    GAsyncReadyCallback callback, gpointer user_data) {
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args,
-                       fl_value_new_custom(130, fl_value_new_int(another_enum),
-                                           (GDestroyNotify)fl_value_unref));
+  fl_value_append_take(
+      args, list != nullptr ? fl_value_ref(list) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoAnotherEnum%s",
+      "echoNullableList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24030,12 +29575,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24047,56 +29592,56 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
-  gboolean return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24108,93 +29653,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-gboolean*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
   }
-  self->return_value_ = fl_value_get_bool(self->return_value);
-  return &self->return_value_;
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, gboolean* a_bool,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, a_bool != nullptr ? fl_value_new_bool(*a_bool)
-                                               : fl_value_new_null());
+  fl_value_append_take(args, enum_list != nullptr ? fl_value_ref(enum_list)
+                                                  : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableBool%s",
+      "echoNullableEnumList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24204,12 +29748,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24221,56 +29765,56 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
-  int64_t return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
-}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24282,88 +29826,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_n
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-int64_t*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse* self) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
   }
-  self->return_value_ = fl_value_get_int(self->return_value);
-  return &self->return_value_;
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, int64_t* an_int,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, an_int != nullptr ? fl_value_new_int(*an_int)
-                                               : fl_value_new_null());
+  fl_value_append_take(args, class_list != nullptr ? fl_value_ref(class_list)
+                                                   : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableInt%s",
+      "echoNullableClassList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24373,12 +29921,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24390,56 +29938,57 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse {
   GObject parent_instance;
 
   FlValue* error;
   FlValue* return_value;
-  double return_value_;
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24451,93 +30000,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_respons
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-double*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
   }
-  self->return_value_ = fl_value_get_float(self->return_value);
-  return &self->return_value_;
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, double* a_double,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, a_double != nullptr ? fl_value_new_float(*a_double)
-                                                 : fl_value_new_null());
+  fl_value_append_take(args, enum_list != nullptr ? fl_value_ref(enum_list)
+                                                  : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableDouble%s",
+      "echoNullableNonNullEnumList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24547,12 +30095,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24564,11 +30112,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -24576,43 +30125,44 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24624,92 +30174,92 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_respons
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
   }
-  return fl_value_get_string(self->return_value);
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const gchar* a_string,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, a_string != nullptr ? fl_value_new_string(a_string)
-                                                 : fl_value_new_null());
+  fl_value_append_take(args, class_list != nullptr ? fl_value_ref(class_list)
+                                                   : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableString%s",
+      "echoNullableNonNullClassList%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24719,12 +30269,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24736,12 +30286,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_new(
       response);
 }
 
-struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -24749,43 +30298,43 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self) {}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24797,97 +30346,87 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_res
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
-const uint8_t*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        self,
-    size_t* return_value_length) {
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
   }
-  if (return_value_length != nullptr) {
-    *return_value_length = fl_value_get_length(self->return_value);
-  }
-  return fl_value_get_uint8_list(self->return_value);
+  return self->return_value;
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, const uint8_t* list,
-    size_t list_length, GCancellable* cancellable, GAsyncReadyCallback callback,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, list != nullptr
-                                 ? fl_value_new_uint8_list(list, list_length)
-                                 : fl_value_new_null());
+  fl_value_append_take(
+      args, map != nullptr ? fl_value_ref(map) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableUint8List%s",
+      "echoNullableMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -24897,12 +30436,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_lis
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -24914,11 +30453,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_fin
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -24926,43 +30466,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -24974,68 +30514,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25044,22 +30584,22 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* string_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(
-      args, list != nullptr ? fl_value_ref(list) : fl_value_new_null());
+  fl_value_append_take(args, string_map != nullptr ? fl_value_ref(string_map)
+                                                   : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableList%s",
+      "echoNullableStringMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25069,12 +30609,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25086,12 +30626,11 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_new(
       response);
 }
 
-struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse {
+struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25099,43 +30638,43 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -25147,68 +30686,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_resp
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25217,22 +30756,22 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_resp
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* int_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, enum_list != nullptr ? fl_value_ref(enum_list)
-                                                  : fl_value_new_null());
+  fl_value_append_take(
+      args, int_map != nullptr ? fl_value_ref(int_map) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableEnumList%s",
+      "echoNullableIntMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25242,12 +30781,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25259,12 +30798,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_fini
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25272,43 +30811,43 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -25320,68 +30859,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_res
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25390,22 +30929,22 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_res
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(args, class_list != nullptr ? fl_value_ref(class_list)
-                                                   : fl_value_new_null());
+  fl_value_append_take(
+      args, enum_map != nullptr ? fl_value_ref(enum_map) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableClassList%s",
+      "echoNullableEnumMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25415,12 +30954,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_lis
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25432,11 +30971,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_fin
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25444,43 +30984,43 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
-}
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -25492,63 +31032,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_n
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse* self) {
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+        self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25557,22 +31102,22 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_g
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
   g_autoptr(FlValue) args = fl_value_new_list();
-  fl_value_append_take(
-      args, map != nullptr ? fl_value_ref(map) : fl_value_new_null());
+  fl_value_append_take(args, class_map != nullptr ? fl_value_ref(class_map)
+                                                  : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableMap%s",
+      "echoNullableClassMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25582,12 +31127,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25599,12 +31144,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_finish(
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25612,43 +31157,44 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -25660,68 +31206,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_res
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25730,13 +31276,13 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_res
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* string_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
@@ -25745,7 +31291,7 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_ma
                                                    : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableStringMap%s",
+      "echoNullableNonNullStringMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25755,12 +31301,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_ma
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25772,11 +31318,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_fin
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_new(
       response);
 }
 
-struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse {
+struct
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25784,43 +31331,44 @@ struct _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse {
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -25832,68 +31380,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_respon
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -25902,13 +31450,13 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_respon
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* int_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
@@ -25917,7 +31465,7 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map(
       args, int_map != nullptr ? fl_value_ref(int_map) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableIntMap%s",
+      "echoNullableNonNullIntMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -25927,12 +31475,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -25944,12 +31492,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_finish
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -25957,43 +31505,44 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse* self =
+      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -26005,68 +31554,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_respo
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -26075,13 +31624,13 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_respo
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
@@ -26090,7 +31639,7 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map(
       args, enum_map != nullptr ? fl_value_ref(enum_map) : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableEnumMap%s",
+      "echoNullableNonNullEnumMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -26100,12 +31649,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map(
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -26117,12 +31666,12 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_finis
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_new(
       response);
 }
 
 struct
-    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse {
+    _CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse {
   GObject parent_instance;
 
   FlValue* error;
@@ -26130,43 +31679,44 @@ struct
 };
 
 G_DEFINE_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response,
     G_TYPE_OBJECT)
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_dispose(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_dispose(
     GObject* object) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
-          object);
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+      self =
+          CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
+              object);
   g_clear_pointer(&self->error, fl_value_unref);
   g_clear_pointer(&self->return_value, fl_value_unref);
   G_OBJECT_CLASS(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_parent_class)
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_parent_class)
       ->dispose(object);
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {}
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_class_init(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponseClass*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_class_init(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponseClass*
         klass) {
   G_OBJECT_CLASS(klass)->dispose =
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_dispose;
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_dispose;
 }
 
-static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_new(
+static CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_new(
     FlValue* response) {
-  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse* self =
-      CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+  CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+      self = CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           g_object_new(
-              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_type(),
+              core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_type(),
               nullptr));
   if (fl_value_get_length(response) > 1) {
     self->error = fl_value_ref(response);
@@ -26178,68 +31728,68 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_resp
 }
 
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       FALSE);
   return self->error != nullptr;
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 0));
 }
 
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
           self));
   return fl_value_get_string(fl_value_get_list_value(self->error, 1));
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
           self));
   return fl_value_get_list_value(self->error, 2);
 }
 
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         self) {
   g_return_val_if_fail(
-      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE(
+      CORE_TESTS_PIGEON_TEST_IS_FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE(
           self),
       nullptr);
   g_assert(
-      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+      !core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
           self));
   if (fl_value_get_type(self->return_value) == FL_VALUE_TYPE_NULL) {
     return nullptr;
@@ -26248,13 +31798,13 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_resp
 }
 
 static void
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_cb(
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_cb(
     GObject* object, GAsyncResult* result, gpointer user_data) {
   GTask* task = G_TASK(user_data);
   g_task_return_pointer(task, result, g_object_unref);
 }
 
-void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data) {
@@ -26263,7 +31813,7 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map
                                                   : fl_value_new_null());
   g_autofree gchar* channel_name = g_strdup_printf(
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoNullableClassMap%s",
+      "echoNullableNonNullClassMap%s",
       self->suffix);
   g_autoptr(CoreTestsPigeonTestMessageCodec) codec =
       core_tests_pigeon_test_message_codec_new();
@@ -26273,12 +31823,12 @@ void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map
   g_task_set_task_data(task, channel, g_object_unref);
   fl_basic_message_channel_send(
       channel, args, cancellable,
-      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_cb,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_cb,
       task);
 }
 
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* self, GAsyncResult* result,
     GError** error) {
   g_autoptr(GTask) task = G_TASK(result);
@@ -26290,7 +31840,7 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_fini
   if (response == nullptr) {
     return nullptr;
   }
-  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_new(
+  return core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_new(
       response);
 }
 
diff --git a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
index 4818d69a72f..94e6eb35d0e 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
+++ b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
@@ -103,11 +103,13 @@ G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestAllTypes,
  * double_list: field in this object.
  * bool_list: field in this object.
  * enum_list: field in this object.
+ * object_list: field in this object.
  * list_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
+ * object_map: field in this object.
  *
  * Creates a new #AllTypes object.
  *
@@ -123,8 +125,8 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
     CoreTestsPigeonTestAnotherEnum another_enum, const gchar* a_string,
     FlValue* an_object, FlValue* list, FlValue* string_list, FlValue* int_list,
     FlValue* double_list, FlValue* bool_list, FlValue* enum_list,
-    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
-    FlValue* enum_map);
+    FlValue* object_list, FlValue* list_list, FlValue* map, FlValue* string_map,
+    FlValue* int_map, FlValue* enum_map, FlValue* object_map);
 
 /**
  * core_tests_pigeon_test_all_types_get_a_bool
@@ -329,6 +331,17 @@ FlValue* core_tests_pigeon_test_all_types_get_bool_list(
 FlValue* core_tests_pigeon_test_all_types_get_enum_list(
     CoreTestsPigeonTestAllTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_types_get_object_list
+ * @object: a #CoreTestsPigeonTestAllTypes.
+ *
+ * Gets the value of the objectList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_types_get_object_list(
+    CoreTestsPigeonTestAllTypes* object);
+
 /**
  * core_tests_pigeon_test_all_types_get_list_list
  * @object: a #CoreTestsPigeonTestAllTypes.
@@ -384,6 +397,17 @@ FlValue* core_tests_pigeon_test_all_types_get_int_map(
 FlValue* core_tests_pigeon_test_all_types_get_enum_map(
     CoreTestsPigeonTestAllTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_types_get_object_map
+ * @object: a #CoreTestsPigeonTestAllTypes.
+ *
+ * Gets the value of the objectMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_types_get_object_map(
+    CoreTestsPigeonTestAllTypes* object);
+
 /**
  * CoreTestsPigeonTestAllNullableTypes:
  *
@@ -419,12 +443,14 @@ G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestAllNullableTypes,
  * double_list: field in this object.
  * bool_list: field in this object.
  * enum_list: field in this object.
+ * object_list: field in this object.
  * list_list: field in this object.
  * recursive_class_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
+ * object_map: field in this object.
  * recursive_class_map: field in this object.
  *
  * Creates a new #AllNullableTypes object.
@@ -444,9 +470,10 @@ core_tests_pigeon_test_all_nullable_types_new(
     const gchar* a_nullable_string, FlValue* a_nullable_object,
     CoreTestsPigeonTestAllNullableTypes* all_nullable_types, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
-    FlValue* bool_list, FlValue* enum_list, FlValue* list_list,
-    FlValue* recursive_class_list, FlValue* map, FlValue* string_map,
-    FlValue* int_map, FlValue* enum_map, FlValue* recursive_class_map);
+    FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
+    FlValue* list_list, FlValue* recursive_class_list, FlValue* map,
+    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* recursive_class_map);
 
 /**
  * core_tests_pigeon_test_all_nullable_types_get_a_nullable_bool
@@ -668,6 +695,17 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_bool_list(
 FlValue* core_tests_pigeon_test_all_nullable_types_get_enum_list(
     CoreTestsPigeonTestAllNullableTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_get_object_list
+ * @object: a #CoreTestsPigeonTestAllNullableTypes.
+ *
+ * Gets the value of the objectList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_nullable_types_get_object_list(
+    CoreTestsPigeonTestAllNullableTypes* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_get_list_list
  * @object: a #CoreTestsPigeonTestAllNullableTypes.
@@ -734,6 +772,17 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_int_map(
 FlValue* core_tests_pigeon_test_all_nullable_types_get_enum_map(
     CoreTestsPigeonTestAllNullableTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_get_object_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypes.
+ *
+ * Gets the value of the objectMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_nullable_types_get_object_map(
+    CoreTestsPigeonTestAllNullableTypes* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_get_recursive_class_map
  * @object: a #CoreTestsPigeonTestAllNullableTypes.
@@ -782,11 +831,13 @@ G_DECLARE_FINAL_TYPE(
  * double_list: field in this object.
  * bool_list: field in this object.
  * enum_list: field in this object.
+ * object_list: field in this object.
  * list_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
+ * object_map: field in this object.
  *
  * Creates a new #AllNullableTypesWithoutRecursion object.
  *
@@ -804,8 +855,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
     CoreTestsPigeonTestAnotherEnum* another_nullable_enum,
     const gchar* a_nullable_string, FlValue* a_nullable_object, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
-    FlValue* bool_list, FlValue* enum_list, FlValue* list_list, FlValue* map,
-    FlValue* string_map, FlValue* int_map, FlValue* enum_map);
+    FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
+    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
+    FlValue* enum_map, FlValue* object_map);
 
 /**
  * core_tests_pigeon_test_all_nullable_types_without_recursion_get_a_nullable_bool
@@ -1030,6 +1082,18 @@ FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_get_enum_list(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_list
+ * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
+ *
+ * Gets the value of the objectList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_list(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_list
  * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
@@ -1089,6 +1153,18 @@ FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_get_enum_map(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
+ *
+ * Gets the value of the objectMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
+
 /**
  * CoreTestsPigeonTestAllClassesWrapper:
  *
@@ -1682,6 +1758,72 @@ CoreTestsPigeonTestHostIntegrationCoreApiEchoClassListResponse*
 core_tests_pigeon_test_host_integration_core_api_echo_class_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details);
 
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullEnumList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullEnumList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullClassList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullClassList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
 G_DECLARE_FINAL_TYPE(
     CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse,
     core_tests_pigeon_test_host_integration_core_api_echo_map_response,
@@ -1839,6 +1981,138 @@ CoreTestsPigeonTestHostIntegrationCoreApiEchoClassMapResponse*
 core_tests_pigeon_test_host_integration_core_api_echo_class_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details);
 
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullStringMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullStringMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullIntMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullIntMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullEnumMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullEnumMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNonNullClassMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNonNullClassMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
 G_DECLARE_FINAL_TYPE(
     CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse,
     core_tests_pigeon_test_host_integration_core_api_echo_class_wrapper_response,
@@ -2541,6 +2815,77 @@ CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassListResponse*
 core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_list_response_new_error(
     const gchar* code, const gchar* message, FlValue* details);
 
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNullableNonNullEnumList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoNullableNonNullEnumList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new:
+ *
+ * Creates a new response to
+ * HostIntegrationCoreApi.echoNullableNonNullClassList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoNullableNonNullClassList.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
 G_DECLARE_FINAL_TYPE(
     CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse,
     core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response,
@@ -2707,85 +3052,224 @@ core_tests_pigeon_test_host_integration_core_api_echo_nullable_class_map_respons
     const gchar* code, const gchar* message, FlValue* details);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new:
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new:
  *
- * Creates a new response to HostIntegrationCoreApi.echoNullableEnum.
+ * Creates a new response to
+ * HostIntegrationCoreApi.echoNullableNonNullStringMap.
  *
  * Returns: a new
- * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse
  */
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new(
-    CoreTestsPigeonTestAnEnum* return_value);
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new(
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error:
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new_error:
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Creates a new error response to HostIntegrationCoreApi.echoNullableEnum.
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoNullableNonNullStringMap.
  *
  * Returns: a new
- * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse
  */
-CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new:
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new:
  *
- * Creates a new response to HostIntegrationCoreApi.echoAnotherNullableEnum.
+ * Creates a new response to HostIntegrationCoreApi.echoNullableNonNullIntMap.
  *
  * Returns: a new
- * #CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse
  */
-CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new(
-    CoreTestsPigeonTestAnotherEnum* return_value);
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new(
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error:
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new_error:
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
  * Creates a new error response to
- * HostIntegrationCoreApi.echoAnotherNullableEnum.
+ * HostIntegrationCoreApi.echoNullableNonNullIntMap.
  *
  * Returns: a new
- * #CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse
  */
-CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
-core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error(
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new_error(
     const gchar* code, const gchar* message, FlValue* details);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse,
-    core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response,
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE, GObject)
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new:
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new:
  *
- * Creates a new response to HostIntegrationCoreApi.echoOptionalNullableInt.
+ * Creates a new response to HostIntegrationCoreApi.echoNullableNonNullEnumMap.
  *
  * Returns: a new
- * #CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoNullableNonNullEnumMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNullableNonNullClassMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new(
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoNullableNonNullClassMap.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoNullableEnum.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new(
+    CoreTestsPigeonTestAnEnum* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to HostIntegrationCoreApi.echoNullableEnum.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_ANOTHER_NULLABLE_ENUM_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoAnotherNullableEnum.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new(
+    CoreTestsPigeonTestAnotherEnum* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error:
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Creates a new error response to
+ * HostIntegrationCoreApi.echoAnotherNullableEnum.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse
+ */
+CoreTestsPigeonTestHostIntegrationCoreApiEchoAnotherNullableEnumResponse*
+core_tests_pigeon_test_host_integration_core_api_echo_another_nullable_enum_response_new_error(
+    const gchar* code, const gchar* message, FlValue* details);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse,
+    core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response,
+    CORE_TESTS_PIGEON_TEST,
+    HOST_INTEGRATION_CORE_API_ECHO_OPTIONAL_NULLABLE_INT_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new:
+ *
+ * Creates a new response to HostIntegrationCoreApi.echoOptionalNullableInt.
+ *
+ * Returns: a new
+ * #CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse
  */
 CoreTestsPigeonTestHostIntegrationCoreApiEchoOptionalNullableIntResponse*
 core_tests_pigeon_test_host_integration_core_api_echo_optional_nullable_int_response_new(
@@ -2878,6 +3362,10 @@ typedef struct {
       *echo_enum_list)(FlValue* enum_list, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoClassListResponse* (
       *echo_class_list)(FlValue* class_list, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse* (
+      *echo_non_null_enum_list)(FlValue* enum_list, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse* (
+      *echo_non_null_class_list)(FlValue* class_list, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse* (*echo_map)(
       FlValue* map, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoStringMapResponse* (
@@ -2888,6 +3376,14 @@ typedef struct {
       *echo_enum_map)(FlValue* enum_map, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoClassMapResponse* (
       *echo_class_map)(FlValue* class_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse* (
+      *echo_non_null_string_map)(FlValue* string_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse* (
+      *echo_non_null_int_map)(FlValue* int_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse* (
+      *echo_non_null_enum_map)(FlValue* enum_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse* (
+      *echo_non_null_class_map)(FlValue* class_map, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse* (
       *echo_class_wrapper)(CoreTestsPigeonTestAllClassesWrapper* wrapper,
                            gpointer user_data);
@@ -2945,6 +3441,12 @@ typedef struct {
       *echo_nullable_enum_list)(FlValue* enum_list, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassListResponse* (
       *echo_nullable_class_list)(FlValue* class_list, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse* (
+      *echo_nullable_non_null_enum_list)(FlValue* enum_list,
+                                         gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse* (
+      *echo_nullable_non_null_class_list)(FlValue* class_list,
+                                          gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse* (
       *echo_nullable_map)(FlValue* map, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableStringMapResponse* (
@@ -2955,6 +3457,16 @@ typedef struct {
       *echo_nullable_enum_map)(FlValue* enum_map, gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableClassMapResponse* (
       *echo_nullable_class_map)(FlValue* class_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse* (
+      *echo_nullable_non_null_string_map)(FlValue* string_map,
+                                          gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse* (
+      *echo_nullable_non_null_int_map)(FlValue* int_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse* (
+      *echo_nullable_non_null_enum_map)(FlValue* enum_map, gpointer user_data);
+  CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse* (
+      *echo_nullable_non_null_class_map)(FlValue* class_map,
+                                         gpointer user_data);
   CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse* (
       *echo_nullable_enum)(CoreTestsPigeonTestAnEnum* an_enum,
                            gpointer user_data);
@@ -3181,6 +3693,14 @@ typedef struct {
       FlValue* class_list,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
       gpointer user_data);
+  void (*call_flutter_echo_non_null_enum_list)(
+      FlValue* enum_list,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_non_null_class_list)(
+      FlValue* class_list,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
   void (*call_flutter_echo_map)(
       FlValue* map,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
@@ -3201,6 +3721,22 @@ typedef struct {
       FlValue* class_map,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
       gpointer user_data);
+  void (*call_flutter_echo_non_null_string_map)(
+      FlValue* string_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_non_null_int_map)(
+      FlValue* int_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_non_null_enum_map)(
+      FlValue* enum_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_non_null_class_map)(
+      FlValue* class_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
   void (*call_flutter_echo_enum)(
       CoreTestsPigeonTestAnEnum an_enum,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
@@ -3241,6 +3777,14 @@ typedef struct {
       FlValue* class_list,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
       gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_enum_list)(
+      FlValue* enum_list,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_class_list)(
+      FlValue* class_list,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
   void (*call_flutter_echo_nullable_map)(
       FlValue* map,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
@@ -3261,6 +3805,22 @@ typedef struct {
       FlValue* class_map,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
       gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_string_map)(
+      FlValue* string_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_int_map)(
+      FlValue* int_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_enum_map)(
+      FlValue* enum_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
+  void (*call_flutter_echo_nullable_non_null_class_map)(
+      FlValue* class_map,
+      CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+      gpointer user_data);
   void (*call_flutter_echo_nullable_enum)(
       CoreTestsPigeonTestAnEnum* an_enum,
       CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
@@ -4632,6 +5192,56 @@ void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullEnumList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullEnumList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullClassList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullClassList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
 /**
  * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
@@ -4753,148 +5363,248 @@ void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_string_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoEnum.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullStringMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_string_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnEnum return_value);
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_string_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to HostIntegrationCoreApi.callFlutterEchoEnum.
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullStringMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_string_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_int_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoAnotherEnum.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullIntMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_int_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    CoreTestsPigeonTestAnotherEnum return_value);
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_int_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to HostIntegrationCoreApi.callFlutterEchoAnotherEnum.
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullIntMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_int_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoNullableBool.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    gboolean* return_value);
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to HostIntegrationCoreApi.callFlutterEchoNullableBool.
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoNullableInt.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNonNullClassMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    int64_t* return_value);
+    FlValue* return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to HostIntegrationCoreApi.callFlutterEchoNullableInt.
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNonNullClassMap.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_map(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoNullableDouble.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoEnum.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    double* return_value);
+    CoreTestsPigeonTestAnEnum return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to
- * HostIntegrationCoreApi.callFlutterEchoNullableDouble.
+ * Responds with an error to HostIntegrationCoreApi.callFlutterEchoEnum.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string:
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @return_value: location to write the value returned by this method.
  *
- * Responds to HostIntegrationCoreApi.callFlutterEchoNullableString.
+ * Responds to HostIntegrationCoreApi.callFlutterEchoAnotherEnum.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string(
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_another_enum(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
-    const gchar* return_value);
+    CoreTestsPigeonTestAnotherEnum return_value);
 
 /**
- * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string:
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
  * @code: error code.
  * @message: error message.
  * @details: (allow-none): error details or %NULL.
  *
- * Responds with an error to
- * HostIntegrationCoreApi.callFlutterEchoNullableString.
+ * Responds with an error to HostIntegrationCoreApi.callFlutterEchoAnotherEnum.
  */
-void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string(
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_another_enum(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableBool.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gboolean* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to HostIntegrationCoreApi.callFlutterEchoNullableBool.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_bool(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableInt.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    int64_t* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to HostIntegrationCoreApi.callFlutterEchoNullableInt.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_int(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableDouble.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    double* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableDouble.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_double(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableString.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_string(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableString.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_string(
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
@@ -4999,6 +5709,56 @@ void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_list:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_list(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
 /**
  * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_map:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
@@ -5123,6 +5883,106 @@ void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter
     CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
     const gchar* code, const gchar* message, FlValue* details);
 
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_string_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_string_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_string_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_int_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_int_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_int_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @return_value: location to write the value returned by this method.
+ *
+ * Responds to HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    FlValue* return_value);
+
+/**
+ * core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_map:
+ * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
+ * @code: error code.
+ * @message: error message.
+ * @details: (allow-none): error details or %NULL.
+ *
+ * Responds with an error to
+ * HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap.
+ */
+void core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_map(
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    const gchar* code, const gchar* message, FlValue* details);
+
 /**
  * core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_enum:
  * @response_handle: a #CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle.
@@ -6317,83 +7177,237 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_response_get
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_map_response,
-    CORE_TESTS_PIGEON_TEST, FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE,
-    GObject)
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_LIST_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoMap is an error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullEnumList is an
+ * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse.
  *
  * Get the return value for this response.
  *
  * Returns: a return value.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+        response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_LIST_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoStringMap is an error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullClassList is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: a return value.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_map_response,
+    CORE_TESTS_PIGEON_TEST, FLUTTER_INTEGRATION_CORE_API_ECHO_MAP_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoMap is an error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: a return value.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse* response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_STRING_MAP_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoStringMap is an error.
  *
  * Returns: a %TRUE if this response is an error.
  */
@@ -6667,1150 +7681,1926 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_response_get_
     CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse* response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response,
-    CORE_TESTS_PIGEON_TEST, FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE,
-    GObject)
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_STRING_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoEnum is an error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullStringMap is an
+ * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value:
- * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: a return value.
  */
-CoreTestsPigeonTestAnEnum
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+        response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_INT_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoAnotherEnum is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullIntMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: a return value.
  */
-CoreTestsPigeonTestAnotherEnum
-core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_ENUM_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableBool is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullEnumMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse.
  *
  * Get the return value for this response.
  *
- * Returns: (allow-none): a return value or %NULL.
+ * Returns: a return value.
  */
-gboolean*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NON_NULL_CLASS_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableInt is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNonNullClassMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse.
  *
  * Get the return value for this response.
  *
- * Returns: (allow-none): a return value or %NULL.
+ * Returns: a return value.
  */
-int64_t*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response,
-    CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE, GObject)
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response,
+    CORE_TESTS_PIGEON_TEST, FLUTTER_INTEGRATION_CORE_API_ECHO_ENUM_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error:
- * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoEnum is an error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value:
+ * @response: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: a return value.
+ */
+CoreTestsPigeonTestAnEnum
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumResponse* response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_ANOTHER_ENUM_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoAnotherEnum is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: a return value.
+ */
+CoreTestsPigeonTestAnotherEnum
+core_tests_pigeon_test_flutter_integration_core_api_echo_another_enum_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoAnotherEnumResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_BOOL_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableBool is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+gboolean*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_bool_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableBoolResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableInt is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+int64_t*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_DOUBLE_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableDouble is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+double*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableString is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableUint8List is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ * @return_value_length: (allow-none): location to write length of the return
+ * value or %NULL to ignore.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+const uint8_t*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+        response,
+    size_t* return_value_length);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableList is an
+ * error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableDouble is an
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE, GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableEnumList is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
-double*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_double_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableDoubleResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableString is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableClassList is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_LIST_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse.
+ *
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableNonNullEnumList
+ * is an error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+        response);
+
+G_DECLARE_FINAL_TYPE(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response,
+    CORE_TESTS_PIGEON_TEST,
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_LIST_RESPONSE,
+    GObject)
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse.
+ *
+ * Checks if a response to
+ * FlutterIntegrationCoreApi.echoNullableNonNullClassList is an error.
+ *
+ * Returns: a %TRUE if this response is an error.
+ */
+gboolean
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_code:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse.
+ *
+ * Get the error code for this response.
+ *
+ * Returns: an error code or %NULL if not an error.
+ */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_message:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse.
+ *
+ * Get the error message for this response.
+ *
+ * Returns: an error message.
+ */
+const gchar*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_details:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse.
+ *
+ * Get the error details for this response.
+ *
+ * Returns: (allow-none): an error details or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+        response);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_return_value:
+ * @response: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse.
+ *
+ * Get the return value for this response.
+ *
+ * Returns: (allow-none): a return value or %NULL.
+ */
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_UINT8_LIST_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableUint8List is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
-FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse.
- * @return_value_length: (allow-none): location to write length of the return
- * value or %NULL to ignore.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
-const uint8_t*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_uint8_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableUint8ListResponse*
-        response,
-    size_t* return_value_length);
+FlValue*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+        response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_LIST_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableList is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableStringMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_LIST_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableEnumList is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableIntMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_LIST_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableClassList is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableEnumMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE, GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableMap is an
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableClassMap is an
  * error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_STRING_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_STRING_MAP_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableStringMap is an
- * error.
+ * Checks if a response to
+ * FlutterIntegrationCoreApi.echoNullableNonNullStringMap is an error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_string_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_INT_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_INT_MAP_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableIntMap is an
- * error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableNonNullIntMap
+ * is an error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_int_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_ENUM_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_ENUM_MAP_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableEnumMap is an
- * error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableNonNullEnumMap
+ * is an error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse,
-    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response,
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse,
+    core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response,
     CORE_TESTS_PIGEON_TEST,
-    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_CLASS_MAP_RESPONSE, GObject)
+    FLUTTER_INTEGRATION_CORE_API_ECHO_NULLABLE_NON_NULL_CLASS_MAP_RESPONSE,
+    GObject)
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse.
  *
- * Checks if a response to FlutterIntegrationCoreApi.echoNullableClassMap is an
- * error.
+ * Checks if a response to FlutterIntegrationCoreApi.echoNullableNonNullClassMap
+ * is an error.
  *
  * Returns: a %TRUE if this response is an error.
  */
 gboolean
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_is_error(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_code:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse.
  *
  * Get the error code for this response.
  *
  * Returns: an error code or %NULL if not an error.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_code(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_code(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_message:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse.
  *
  * Get the error message for this response.
  *
  * Returns: an error message.
  */
 const gchar*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_message(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_message(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_details:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse.
  *
  * Get the error details for this response.
  *
  * Returns: (allow-none): an error details or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_error_details(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_details(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         response);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_return_value:
  * @response: a
- * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse.
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse.
  *
  * Get the return value for this response.
  *
  * Returns: (allow-none): a return value or %NULL.
  */
 FlValue*
-core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_response_get_return_value(
-    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_return_value(
+    CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
         response);
 
 G_DECLARE_FINAL_TYPE(
@@ -8655,41 +10445,249 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_list_finish(
 /**
  * core_tests_pigeon_test_flutter_integration_core_api_echo_class_list:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
- * @class_list: parameter for this method.
+ * @class_list: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed list, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_class_list() call.
+ *
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @enum_list: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed list, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* enum_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse or
+ * %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @class_list: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed list, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse or
+ * %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @map: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a core_tests_pigeon_test_flutter_integration_core_api_echo_map()
+ * call.
+ *
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse or
+ * %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @string_map: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_string_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* string_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map() call.
+ *
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @int_map: parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* int_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map() call.
+ *
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse or
+ * %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @enum_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
  * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
  * the call is complete or %NULL to ignore the response.
  * @user_data: (closure): user data to pass to @callback.
  *
- * Returns the passed list, to test serialization and deserialization.
+ * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_class_list(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_list,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
  * Completes a
- * core_tests_pigeon_test_flutter_integration_core_api_echo_class_list() call.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map() call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse
  * or %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassListResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
- * @map: parameter for this method.
+ * @class_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
  * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
  * the call is complete or %NULL to ignore the response.
@@ -8697,31 +10695,31 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_class_list_finish(
  *
  * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_map(
-    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* map,
+void core_tests_pigeon_test_flutter_integration_core_api_echo_class_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
- * Completes a core_tests_pigeon_test_flutter_integration_core_api_echo_map()
- * call.
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map() call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse or
- * %NULL on error.
+ * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse
+ * or %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @string_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
@@ -8731,31 +10729,33 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_map_finish(
  *
  * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_string_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* string_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
  * Completes a
- * core_tests_pigeon_test_flutter_integration_core_api_echo_string_map() call.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map()
+ * call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse
- * or %NULL on error.
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse or
+ * %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoStringMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @int_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
@@ -8765,31 +10765,33 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_string_map_finish(
  *
  * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_int_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* int_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
  * Completes a
- * core_tests_pigeon_test_flutter_integration_core_api_echo_int_map() call.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map()
+ * call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse or
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse or
  * %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoIntMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @enum_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
@@ -8799,31 +10801,33 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_int_map_finish(
  *
  * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* enum_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
  * Completes a
- * core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map() call.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map()
+ * call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse
- * or %NULL on error.
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse or
+ * %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoEnumMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @class_map: parameter for this method.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
@@ -8833,26 +10837,28 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_enum_map_finish(
  *
  * Returns the passed map, to test serialization and deserialization.
  */
-void core_tests_pigeon_test_flutter_integration_core_api_echo_class_map(
+void core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_map,
     GCancellable* cancellable, GAsyncReadyCallback callback,
     gpointer user_data);
 
 /**
- * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish:
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_finish:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
  * Completes a
- * core_tests_pigeon_test_flutter_integration_core_api_echo_class_map() call.
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map()
+ * call.
  *
- * Returns: a #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse
- * or %NULL on error.
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse or
+ * %NULL on error.
  */
-CoreTestsPigeonTestFlutterIntegrationCoreApiEchoClassMapResponse*
-core_tests_pigeon_test_flutter_integration_core_api_echo_class_map_finish(
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_finish(
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
@@ -9213,6 +11219,78 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_list_fin
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @enum_list: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed list, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* enum_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @class_list: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed list, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_list,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
 /**
  * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_map:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
@@ -9392,6 +11470,150 @@ core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_class_map_fini
     CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
     GError** error);
 
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @string_map: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* string_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @int_map: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* int_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @enum_map: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* enum_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @class_map: (allow-none): parameter for this method.
+ * @cancellable: (allow-none): a #GCancellable or %NULL.
+ * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
+ * the call is complete or %NULL to ignore the response.
+ * @user_data: (closure): user data to pass to @callback.
+ *
+ * Returns the passed map, to test serialization and deserialization.
+ */
+void core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, FlValue* class_map,
+    GCancellable* cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+/**
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_finish:
+ * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
+ * @result: a #GAsyncResult.
+ * @error: (allow-none): #GError location to store the error occurring, or %NULL
+ * to ignore.
+ *
+ * Completes a
+ * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map()
+ * call.
+ *
+ * Returns: a
+ * #CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse
+ * or %NULL on error.
+ */
+CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_finish(
+    CoreTestsPigeonTestFlutterIntegrationCoreApi* api, GAsyncResult* result,
+    GError** error);
+
 /**
  * core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_enum:
  * @api: a #CoreTestsPigeonTestFlutterIntegrationCoreApi.
diff --git a/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc b/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
index 186f28cab13..9f1ef2fbf49 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
+++ b/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
@@ -137,6 +137,18 @@ echo_class_list(FlValue* class_list, gpointer user_data) {
       class_list);
 }
 
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumListResponse*
+echo_non_null_enum_list(FlValue* enum_list, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_list_response_new(
+      enum_list);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassListResponse*
+echo_non_null_class_list(FlValue* class_list, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_list_response_new(
+      class_list);
+}
+
 static CoreTestsPigeonTestHostIntegrationCoreApiEchoMapResponse* echo_map(
     FlValue* map, gpointer user_data) {
   return core_tests_pigeon_test_host_integration_core_api_echo_map_response_new(
@@ -167,6 +179,30 @@ echo_class_map(FlValue* class_map, gpointer user_data) {
       class_map);
 }
 
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullStringMapResponse*
+echo_non_null_string_map(FlValue* string_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_string_map_response_new(
+      string_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullIntMapResponse*
+echo_non_null_int_map(FlValue* int_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_int_map_response_new(
+      int_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullEnumMapResponse*
+echo_non_null_enum_map(FlValue* _enum_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_enum_map_response_new(
+      _enum_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNonNullClassMapResponse*
+echo_non_null_class_map(FlValue* class_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_non_null_class_map_response_new(
+      class_map);
+}
+
 static CoreTestsPigeonTestHostIntegrationCoreApiEchoClassWrapperResponse*
 echo_class_wrapper(CoreTestsPigeonTestAllClassesWrapper* wrapper,
                    gpointer user_data) {
@@ -241,7 +277,8 @@ create_nested_nullable_string(const gchar* nullable_string,
           nullptr, nullptr, nullptr, nullptr, nullptr, 0, nullptr, 0, nullptr,
           0, nullptr, 0, nullptr, nullptr, nullable_string, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+          nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+          nullptr);
   FlValue* classList = fl_value_new_list();
   FlValue* classMap = fl_value_new_map();
   g_autoptr(CoreTestsPigeonTestAllClassesWrapper) wrapper =
@@ -261,7 +298,7 @@ send_multiple_nullable_types(gboolean* a_nullable_bool, int64_t* a_nullable_int,
           nullptr, 0, nullptr, 0, nullptr, 0, nullptr, nullptr,
           a_nullable_string, nullptr, nullptr, nullptr, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr, nullptr, nullptr);
+          nullptr, nullptr, nullptr, nullptr, nullptr);
   return core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_response_new(
       types);
 }
@@ -276,7 +313,8 @@ send_multiple_nullable_types_without_recursion(gboolean* a_nullable_bool,
           a_nullable_bool, a_nullable_int, nullptr, nullptr, nullptr, 0,
           nullptr, 0, nullptr, 0, nullptr, 0, nullptr, nullptr,
           a_nullable_string, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+          nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+          nullptr, nullptr);
   return core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
       types);
 }
@@ -337,6 +375,18 @@ echo_nullable_class_list(FlValue* class_list, gpointer user_data) {
       class_list);
 }
 
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumListResponse*
+echo_nullable_non_null_enum_list(FlValue* enum_list, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_list_response_new(
+      enum_list);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassListResponse*
+echo_nullable_non_null_class_list(FlValue* class_list, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_list_response_new(
+      class_list);
+}
+
 static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableMapResponse*
 echo_nullable_map(FlValue* map, gpointer user_data) {
   return core_tests_pigeon_test_host_integration_core_api_echo_nullable_map_response_new(
@@ -367,6 +417,30 @@ echo_nullable_class_map(FlValue* class_map, gpointer user_data) {
       class_map);
 }
 
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullStringMapResponse*
+echo_nullable_non_null_string_map(FlValue* string_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_string_map_response_new(
+      string_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullIntMapResponse*
+echo_nullable_non_null_int_map(FlValue* int_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_int_map_response_new(
+      int_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullEnumMapResponse*
+echo_nullable_non_null_enum_map(FlValue* enum_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_enum_map_response_new(
+      enum_map);
+}
+
+static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableNonNullClassMapResponse*
+echo_nullable_non_null_class_map(FlValue* class_map, gpointer user_data) {
+  return core_tests_pigeon_test_host_integration_core_api_echo_nullable_non_null_class_map_response_new(
+      class_map);
+}
+
 static CoreTestsPigeonTestHostIntegrationCoreApiEchoNullableEnumResponse*
 echo_nullable_enum(CoreTestsPigeonTestAnEnum* an_enum, gpointer user_data) {
   return core_tests_pigeon_test_host_integration_core_api_echo_nullable_enum_response_new(
@@ -1446,6 +1520,98 @@ static void call_flutter_echo_class_list(
       callback_data_new(self, response_handle));
 }
 
+static void echo_non_null_enum_list_cb(GObject* object, GAsyncResult* result,
+                                       gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumListResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_list(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_list(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_enum_list(
+    FlValue* enum_list,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_list(
+      self->flutter_core_api, enum_list, self->cancellable,
+      echo_non_null_enum_list_cb, callback_data_new(self, response_handle));
+}
+
+static void echo_non_null_class_list_cb(GObject* object, GAsyncResult* result,
+                                        gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_list(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_list(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_class_list(
+    FlValue* class_list,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_list(
+      self->flutter_core_api, class_list, self->cancellable,
+      echo_non_null_class_list_cb, callback_data_new(self, response_handle));
+}
+
 static void echo_map_cb(GObject* object, GAsyncResult* result,
                         gpointer user_data) {
   g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
@@ -1671,6 +1837,190 @@ static void call_flutter_echo_class_map(
       callback_data_new(self, response_handle));
 }
 
+static void echo_non_null_string_map_cb(GObject* object, GAsyncResult* result,
+                                        gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_string_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_string_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_string_map(
+    FlValue* string_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_string_map(
+      self->flutter_core_api, string_map, self->cancellable,
+      echo_non_null_string_map_cb, callback_data_new(self, response_handle));
+}
+
+static void echo_non_null_int_map_cb(GObject* object, GAsyncResult* result,
+                                     gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullIntMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_int_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_int_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_int_map(
+    FlValue* int_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_int_map(
+      self->flutter_core_api, int_map, self->cancellable,
+      echo_non_null_int_map_cb, callback_data_new(self, response_handle));
+}
+
+static void echo_non_null_enum_map_cb(GObject* object, GAsyncResult* result,
+                                      gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_enum_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_enum_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_enum_map(
+    FlValue* enum_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_enum_map(
+      self->flutter_core_api, enum_map, self->cancellable,
+      echo_non_null_enum_map_cb, callback_data_new(self, response_handle));
+}
+
+static void echo_non_null_class_map_cb(GObject* object, GAsyncResult* result,
+                                       gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_non_null_class_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_non_null_class_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_non_null_class_map(
+    FlValue* class_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_non_null_class_map(
+      self->flutter_core_api, class_map, self->cancellable,
+      echo_non_null_class_map_cb, callback_data_new(self, response_handle));
+}
+
 static void echo_enum_cb(GObject* object, GAsyncResult* result,
                          gpointer user_data) {
   g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
@@ -2132,6 +2482,102 @@ static void call_flutter_echo_nullable_class_list(
       echo_nullable_class_list_cb, callback_data_new(self, response_handle));
 }
 
+static void echo_nullable_non_null_enum_list_cb(GObject* object,
+                                                GAsyncResult* result,
+                                                gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumListResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_list(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_list(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_enum_list(
+    FlValue* enum_list,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_list(
+      self->flutter_core_api, enum_list, self->cancellable,
+      echo_nullable_non_null_enum_list_cb,
+      callback_data_new(self, response_handle));
+}
+
+static void echo_nullable_non_null_class_list_cb(GObject* object,
+                                                 GAsyncResult* result,
+                                                 gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassListResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_list(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_list(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_class_list(
+    FlValue* class_list,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_list(
+      self->flutter_core_api, class_list, self->cancellable,
+      echo_nullable_non_null_class_list_cb,
+      callback_data_new(self, response_handle));
+}
+
 static void echo_nullable_map_cb(GObject* object, GAsyncResult* result,
                                  gpointer user_data) {
   g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
@@ -2361,6 +2807,198 @@ static void call_flutter_echo_nullable_class_map(
       echo_nullable_class_map_cb, callback_data_new(self, response_handle));
 }
 
+static void echo_nullable_non_null_string_map_cb(GObject* object,
+                                                 GAsyncResult* result,
+                                                 gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullStringMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_string_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_string_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_string_map(
+    FlValue* string_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_string_map(
+      self->flutter_core_api, string_map, self->cancellable,
+      echo_nullable_non_null_string_map_cb,
+      callback_data_new(self, response_handle));
+}
+
+static void echo_nullable_non_null_int_map_cb(GObject* object,
+                                              GAsyncResult* result,
+                                              gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullIntMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_int_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_int_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_int_map(
+    FlValue* int_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_int_map(
+      self->flutter_core_api, int_map, self->cancellable,
+      echo_nullable_non_null_int_map_cb,
+      callback_data_new(self, response_handle));
+}
+
+static void echo_nullable_non_null_enum_map_cb(GObject* object,
+                                               GAsyncResult* result,
+                                               gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullEnumMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_enum_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_enum_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_enum_map(
+    FlValue* enum_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_enum_map(
+      self->flutter_core_api, enum_map, self->cancellable,
+      echo_nullable_non_null_enum_map_cb,
+      callback_data_new(self, response_handle));
+}
+
+static void echo_nullable_non_null_class_map_cb(GObject* object,
+                                                GAsyncResult* result,
+                                                gpointer user_data) {
+  g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(
+      CoreTestsPigeonTestFlutterIntegrationCoreApiEchoNullableNonNullClassMapResponse)
+      response =
+          core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_finish(
+              CORE_TESTS_PIGEON_TEST_FLUTTER_INTEGRATION_CORE_API(object),
+              result, &error);
+  if (response == nullptr) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_nullable_non_null_class_map(
+        data->response_handle, "Internal Error", error->message, nullptr);
+    return;
+  }
+  if (core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_is_error(
+          response)) {
+    core_tests_pigeon_test_host_integration_core_api_respond_error_call_flutter_echo_bool(
+        data->response_handle,
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_code(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_message(
+            response),
+        core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_error_details(
+            response));
+    return;
+  }
+
+  core_tests_pigeon_test_host_integration_core_api_respond_call_flutter_echo_nullable_non_null_class_map(
+      data->response_handle,
+      core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map_response_get_return_value(
+          response));
+}
+
+static void call_flutter_echo_nullable_non_null_class_map(
+    FlValue* class_map,
+    CoreTestsPigeonTestHostIntegrationCoreApiResponseHandle* response_handle,
+    gpointer user_data) {
+  TestPlugin* self = TEST_PLUGIN(user_data);
+
+  core_tests_pigeon_test_flutter_integration_core_api_echo_nullable_non_null_class_map(
+      self->flutter_core_api, class_map, self->cancellable,
+      echo_nullable_non_null_class_map_cb,
+      callback_data_new(self, response_handle));
+}
+
 static void echo_nullable_enum_cb(GObject* object, GAsyncResult* result,
                                   gpointer user_data) {
   g_autoptr(CallbackData) data = static_cast<CallbackData*>(user_data);
@@ -2551,11 +3189,17 @@ static CoreTestsPigeonTestHostIntegrationCoreApiVTable host_core_api_vtable = {
     .echo_list = echo_list,
     .echo_enum_list = echo_enum_list,
     .echo_class_list = echo_class_list,
+    .echo_non_null_enum_list = echo_non_null_enum_list,
+    .echo_non_null_class_list = echo_non_null_class_list,
     .echo_map = echo_map,
     .echo_string_map = echo_string_map,
     .echo_int_map = echo_int_map,
     .echo_enum_map = echo_enum_map,
     .echo_class_map = echo_class_map,
+    .echo_non_null_string_map = echo_non_null_string_map,
+    .echo_non_null_int_map = echo_non_null_int_map,
+    .echo_non_null_enum_map = echo_non_null_enum_map,
+    .echo_non_null_class_map = echo_non_null_class_map,
     .echo_class_wrapper = echo_class_wrapper,
     .echo_enum = echo_enum,
     .echo_another_enum = echo_another_enum,
@@ -2579,11 +3223,17 @@ static CoreTestsPigeonTestHostIntegrationCoreApiVTable host_core_api_vtable = {
     .echo_nullable_list = echo_nullable_list,
     .echo_nullable_enum_list = echo_nullable_enum_list,
     .echo_nullable_class_list = echo_nullable_class_list,
+    .echo_nullable_non_null_enum_list = echo_nullable_non_null_enum_list,
+    .echo_nullable_non_null_class_list = echo_nullable_non_null_class_list,
     .echo_nullable_map = echo_nullable_map,
     .echo_nullable_string_map = echo_nullable_string_map,
     .echo_nullable_int_map = echo_nullable_int_map,
     .echo_nullable_enum_map = echo_nullable_enum_map,
     .echo_nullable_class_map = echo_nullable_class_map,
+    .echo_nullable_non_null_string_map = echo_nullable_non_null_string_map,
+    .echo_nullable_non_null_int_map = echo_nullable_non_null_int_map,
+    .echo_nullable_non_null_enum_map = echo_nullable_non_null_enum_map,
+    .echo_nullable_non_null_class_map = echo_nullable_non_null_class_map,
     .echo_nullable_enum = echo_nullable_enum,
     .echo_another_nullable_enum = echo_another_nullable_enum,
     .echo_optional_nullable_int = echo_optional_nullable_int,
@@ -2649,11 +3299,21 @@ static CoreTestsPigeonTestHostIntegrationCoreApiVTable host_core_api_vtable = {
     .call_flutter_echo_list = call_flutter_echo_list,
     .call_flutter_echo_enum_list = call_flutter_echo_enum_list,
     .call_flutter_echo_class_list = call_flutter_echo_class_list,
+    .call_flutter_echo_non_null_enum_list =
+        call_flutter_echo_non_null_enum_list,
+    .call_flutter_echo_non_null_class_list =
+        call_flutter_echo_non_null_class_list,
     .call_flutter_echo_map = call_flutter_echo_map,
     .call_flutter_echo_string_map = call_flutter_echo_string_map,
     .call_flutter_echo_int_map = call_flutter_echo_int_map,
     .call_flutter_echo_enum_map = call_flutter_echo_enum_map,
     .call_flutter_echo_class_map = call_flutter_echo_class_map,
+    .call_flutter_echo_non_null_string_map =
+        call_flutter_echo_non_null_string_map,
+    .call_flutter_echo_non_null_int_map = call_flutter_echo_non_null_int_map,
+    .call_flutter_echo_non_null_enum_map = call_flutter_echo_non_null_enum_map,
+    .call_flutter_echo_non_null_class_map =
+        call_flutter_echo_non_null_class_map,
     .call_flutter_echo_enum = call_flutter_echo_enum,
     .call_flutter_echo_another_enum = call_flutter_echo_another_enum,
     .call_flutter_echo_nullable_bool = call_flutter_echo_nullable_bool,
@@ -2667,6 +3327,10 @@ static CoreTestsPigeonTestHostIntegrationCoreApiVTable host_core_api_vtable = {
         call_flutter_echo_nullable_enum_list,
     .call_flutter_echo_nullable_class_list =
         call_flutter_echo_nullable_class_list,
+    .call_flutter_echo_nullable_non_null_enum_list =
+        call_flutter_echo_nullable_non_null_enum_list,
+    .call_flutter_echo_nullable_non_null_class_list =
+        call_flutter_echo_nullable_non_null_class_list,
     .call_flutter_echo_nullable_map = call_flutter_echo_nullable_map,
     .call_flutter_echo_nullable_string_map =
         call_flutter_echo_nullable_string_map,
@@ -2674,6 +3338,14 @@ static CoreTestsPigeonTestHostIntegrationCoreApiVTable host_core_api_vtable = {
     .call_flutter_echo_nullable_enum_map = call_flutter_echo_nullable_enum_map,
     .call_flutter_echo_nullable_class_map =
         call_flutter_echo_nullable_class_map,
+    .call_flutter_echo_nullable_non_null_string_map =
+        call_flutter_echo_nullable_non_null_string_map,
+    .call_flutter_echo_nullable_non_null_int_map =
+        call_flutter_echo_nullable_non_null_int_map,
+    .call_flutter_echo_nullable_non_null_enum_map =
+        call_flutter_echo_nullable_non_null_enum_map,
+    .call_flutter_echo_nullable_non_null_class_map =
+        call_flutter_echo_nullable_non_null_class_map,
     .call_flutter_echo_nullable_enum = call_flutter_echo_nullable_enum,
     .call_flutter_echo_another_nullable_enum =
         call_flutter_echo_another_nullable_enum,
diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
index 72e34addd2d..0101cd8c075 100644
--- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
+++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
@@ -122,16 +122,18 @@ struct AllTypes {
   var aString: String
   var anObject: Any
   var list: [Any?]
-  var stringList: [String?]
-  var intList: [Int64?]
-  var doubleList: [Double?]
-  var boolList: [Bool?]
-  var enumList: [AnEnum?]
-  var listList: [[Any?]?]
+  var stringList: [String]
+  var intList: [Int64]
+  var doubleList: [Double]
+  var boolList: [Bool]
+  var enumList: [AnEnum]
+  var objectList: [Any]
+  var listList: [[Any?]]
   var map: [AnyHashable?: Any?]
-  var stringMap: [String?: String?]
-  var intMap: [Int64?: Int64?]
-  var enumMap: [AnEnum?: AnEnum?]
+  var stringMap: [String: String]
+  var intMap: [Int64: Int64]
+  var enumMap: [AnEnum: AnEnum]
+  var objectMap: [AnyHashable: Any]
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllTypes? {
@@ -148,16 +150,18 @@ struct AllTypes {
     let aString = pigeonVar_list[10] as! String
     let anObject = pigeonVar_list[11]!
     let list = pigeonVar_list[12] as! [Any?]
-    let stringList = pigeonVar_list[13] as! [String?]
-    let intList = pigeonVar_list[14] as! [Int64?]
-    let doubleList = pigeonVar_list[15] as! [Double?]
-    let boolList = pigeonVar_list[16] as! [Bool?]
-    let enumList = pigeonVar_list[17] as! [AnEnum?]
-    let listList = pigeonVar_list[18] as! [[Any?]?]
-    let map = pigeonVar_list[19] as! [AnyHashable?: Any?]
-    let stringMap = pigeonVar_list[20] as! [String?: String?]
-    let intMap = pigeonVar_list[21] as! [Int64?: Int64?]
-    let enumMap = pigeonVar_list[22] as? [AnEnum?: AnEnum?]
+    let stringList = pigeonVar_list[13] as! [String]
+    let intList = pigeonVar_list[14] as! [Int64]
+    let doubleList = pigeonVar_list[15] as! [Double]
+    let boolList = pigeonVar_list[16] as! [Bool]
+    let enumList = pigeonVar_list[17] as! [AnEnum]
+    let objectList = pigeonVar_list[18] as! [Any]
+    let listList = pigeonVar_list[19] as! [[Any?]]
+    let map = pigeonVar_list[20] as! [AnyHashable?: Any?]
+    let stringMap = pigeonVar_list[21] as! [String: String]
+    let intMap = pigeonVar_list[22] as! [Int64: Int64]
+    let enumMap = pigeonVar_list[23] as? [AnEnum: AnEnum]
+    let objectMap = pigeonVar_list[24] as! [AnyHashable: Any]
 
     return AllTypes(
       aBool: aBool,
@@ -178,11 +182,13 @@ struct AllTypes {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
-      enumMap: enumMap!
+      enumMap: enumMap!,
+      objectMap: objectMap
     )
   }
   func toList() -> [Any?] {
@@ -205,11 +211,13 @@ struct AllTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ]
   }
 }
@@ -238,12 +246,14 @@ class AllNullableTypes {
     doubleList: [Double?]? = nil,
     boolList: [Bool?]? = nil,
     enumList: [AnEnum?]? = nil,
+    objectList: [Any?]? = nil,
     listList: [[Any?]?]? = nil,
     recursiveClassList: [AllNullableTypes?]? = nil,
     map: [AnyHashable?: Any?]? = nil,
     stringMap: [String?: String?]? = nil,
     intMap: [Int64?: Int64?]? = nil,
     enumMap: [AnEnum?: AnEnum?]? = nil,
+    objectMap: [AnyHashable?: Any?]? = nil,
     recursiveClassMap: [Int64?: AllNullableTypes?]? = nil
   ) {
     self.aNullableBool = aNullableBool
@@ -265,12 +275,14 @@ class AllNullableTypes {
     self.doubleList = doubleList
     self.boolList = boolList
     self.enumList = enumList
+    self.objectList = objectList
     self.listList = listList
     self.recursiveClassList = recursiveClassList
     self.map = map
     self.stringMap = stringMap
     self.intMap = intMap
     self.enumMap = enumMap
+    self.objectMap = objectMap
     self.recursiveClassMap = recursiveClassMap
   }
   var aNullableBool: Bool?
@@ -292,12 +304,14 @@ class AllNullableTypes {
   var doubleList: [Double?]?
   var boolList: [Bool?]?
   var enumList: [AnEnum?]?
+  var objectList: [Any?]?
   var listList: [[Any?]?]?
   var recursiveClassList: [AllNullableTypes?]?
   var map: [AnyHashable?: Any?]?
   var stringMap: [String?: String?]?
   var intMap: [Int64?: Int64?]?
   var enumMap: [AnEnum?: AnEnum?]?
+  var objectMap: [AnyHashable?: Any?]?
   var recursiveClassMap: [Int64?: AllNullableTypes?]?
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -321,13 +335,15 @@ class AllNullableTypes {
     let doubleList: [Double?]? = nilOrValue(pigeonVar_list[16])
     let boolList: [Bool?]? = nilOrValue(pigeonVar_list[17])
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[18])
-    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
-    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[20])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[21])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[22])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[23])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[24] as? [AnEnum?: AnEnum?]
-    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[25])
+    let objectList: [Any?]? = nilOrValue(pigeonVar_list[19])
+    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[20])
+    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[21])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[22])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[23])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[24])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[25] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[26])
+    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[27])
 
     return AllNullableTypes(
       aNullableBool: aNullableBool,
@@ -349,12 +365,14 @@ class AllNullableTypes {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       recursiveClassList: recursiveClassList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
+      objectMap: objectMap,
       recursiveClassMap: recursiveClassMap
     )
   }
@@ -379,12 +397,14 @@ class AllNullableTypes {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
       recursiveClassMap,
     ]
   }
@@ -414,11 +434,13 @@ struct AllNullableTypesWithoutRecursion {
   var doubleList: [Double?]? = nil
   var boolList: [Bool?]? = nil
   var enumList: [AnEnum?]? = nil
+  var objectList: [Any?]? = nil
   var listList: [[Any?]?]? = nil
   var map: [AnyHashable?: Any?]? = nil
   var stringMap: [String?: String?]? = nil
   var intMap: [Int64?: Int64?]? = nil
   var enumMap: [AnEnum?: AnEnum?]? = nil
+  var objectMap: [AnyHashable?: Any?]? = nil
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllNullableTypesWithoutRecursion? {
@@ -440,11 +462,13 @@ struct AllNullableTypesWithoutRecursion {
     let doubleList: [Double?]? = nilOrValue(pigeonVar_list[15])
     let boolList: [Bool?]? = nilOrValue(pigeonVar_list[16])
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[17])
-    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[18])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[19])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[20])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[21])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[22] as? [AnEnum?: AnEnum?]
+    let objectList: [Any?]? = nilOrValue(pigeonVar_list[18])
+    let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[20])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[21])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[22])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[23] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[24])
 
     return AllNullableTypesWithoutRecursion(
       aNullableBool: aNullableBool,
@@ -465,11 +489,13 @@ struct AllNullableTypesWithoutRecursion {
       doubleList: doubleList,
       boolList: boolList,
       enumList: enumList,
+      objectList: objectList,
       listList: listList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
-      enumMap: enumMap
+      enumMap: enumMap,
+      objectMap: objectMap
     )
   }
   func toList() -> [Any?] {
@@ -492,11 +518,13 @@ struct AllNullableTypesWithoutRecursion {
       doubleList,
       boolList,
       enumList,
+      objectList,
       listList,
       map,
       stringMap,
       intMap,
       enumMap,
+      objectMap,
     ]
   }
 }
@@ -686,6 +714,10 @@ protocol HostIntegrationCoreApi {
   func echo(enumList: [AnEnum?]) throws -> [AnEnum?]
   /// Returns the passed list, to test serialization and deserialization.
   func echo(classList: [AllNullableTypes?]) throws -> [AllNullableTypes?]
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(enumList: [AnEnum]) throws -> [AnEnum]
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(classList: [AllNullableTypes]) throws -> [AllNullableTypes]
   /// Returns the passed map, to test serialization and deserialization.
   func echo(_ map: [AnyHashable?: Any?]) throws -> [AnyHashable?: Any?]
   /// Returns the passed map, to test serialization and deserialization.
@@ -696,6 +728,14 @@ protocol HostIntegrationCoreApi {
   func echo(enumMap: [AnEnum?: AnEnum?]) throws -> [AnEnum?: AnEnum?]
   /// Returns the passed map, to test serialization and deserialization.
   func echo(classMap: [Int64?: AllNullableTypes?]) throws -> [Int64?: AllNullableTypes?]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(stringMap: [String: String]) throws -> [String: String]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(intMap: [Int64: Int64]) throws -> [Int64: Int64]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(enumMap: [AnEnum: AnEnum]) throws -> [AnEnum: AnEnum]
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(classMap: [Int64: AllNullableTypes]) throws -> [Int64: AllNullableTypes]
   /// Returns the passed class to test nested class serialization and deserialization.
   func echo(_ wrapper: AllClassesWrapper) throws -> AllClassesWrapper
   /// Returns the passed enum to test serialization and deserialization.
@@ -745,6 +785,10 @@ protocol HostIntegrationCoreApi {
   func echoNullable(enumList: [AnEnum?]?) throws -> [AnEnum?]?
   /// Returns the passed list, to test serialization and deserialization.
   func echoNullable(classList: [AllNullableTypes?]?) throws -> [AllNullableTypes?]?
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(enumList: [AnEnum]?) throws -> [AnEnum]?
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(classList: [AllNullableTypes]?) throws -> [AllNullableTypes]?
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(_ map: [AnyHashable?: Any?]?) throws -> [AnyHashable?: Any?]?
   /// Returns the passed map, to test serialization and deserialization.
@@ -755,6 +799,15 @@ protocol HostIntegrationCoreApi {
   func echoNullable(enumMap: [AnEnum?: AnEnum?]?) throws -> [AnEnum?: AnEnum?]?
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(classMap: [Int64?: AllNullableTypes?]?) throws -> [Int64?: AllNullableTypes?]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(stringMap: [String: String]?) throws -> [String: String]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(intMap: [Int64: Int64]?) throws -> [Int64: Int64]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(enumMap: [AnEnum: AnEnum]?) throws -> [AnEnum: AnEnum]?
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(classMap: [Int64: AllNullableTypes]?) throws -> [Int64:
+    AllNullableTypes]?
   func echoNullable(_ anEnum: AnEnum?) throws -> AnEnum?
   func echoNullable(_ anotherEnum: AnotherEnum?) throws -> AnotherEnum?
   /// Returns passed in int.
@@ -902,6 +955,11 @@ protocol HostIntegrationCoreApi {
   func callFlutterEcho(
     classList: [AllNullableTypes?],
     completion: @escaping (Result<[AllNullableTypes?], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    enumList: [AnEnum], completion: @escaping (Result<[AnEnum], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    classList: [AllNullableTypes], completion: @escaping (Result<[AllNullableTypes], Error>) -> Void
+  )
   func callFlutterEcho(
     _ map: [AnyHashable?: Any?], completion: @escaping (Result<[AnyHashable?: Any?], Error>) -> Void
   )
@@ -915,6 +973,15 @@ protocol HostIntegrationCoreApi {
   func callFlutterEcho(
     classMap: [Int64?: AllNullableTypes?],
     completion: @escaping (Result<[Int64?: AllNullableTypes?], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    stringMap: [String: String], completion: @escaping (Result<[String: String], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    intMap: [Int64: Int64], completion: @escaping (Result<[Int64: Int64], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    enumMap: [AnEnum: AnEnum], completion: @escaping (Result<[AnEnum: AnEnum], Error>) -> Void)
+  func callFlutterEchoNonNull(
+    classMap: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], Error>) -> Void)
   func callFlutterEcho(_ anEnum: AnEnum, completion: @escaping (Result<AnEnum, Error>) -> Void)
   func callFlutterEcho(
     _ anotherEnum: AnotherEnum, completion: @escaping (Result<AnotherEnum, Error>) -> Void)
@@ -935,6 +1002,11 @@ protocol HostIntegrationCoreApi {
   func callFlutterEchoNullable(
     classList: [AllNullableTypes?]?,
     completion: @escaping (Result<[AllNullableTypes?]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    enumList: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    classList: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, Error>) -> Void)
   func callFlutterEchoNullable(
     _ map: [AnyHashable?: Any?]?,
     completion: @escaping (Result<[AnyHashable?: Any?]?, Error>) -> Void)
@@ -949,6 +1021,15 @@ protocol HostIntegrationCoreApi {
   func callFlutterEchoNullable(
     classMap: [Int64?: AllNullableTypes?]?,
     completion: @escaping (Result<[Int64?: AllNullableTypes?]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    stringMap: [String: String]?, completion: @escaping (Result<[String: String]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    intMap: [Int64: Int64]?, completion: @escaping (Result<[Int64: Int64]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    enumMap: [AnEnum: AnEnum]?, completion: @escaping (Result<[AnEnum: AnEnum]?, Error>) -> Void)
+  func callFlutterEchoNullableNonNull(
+    classMap: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, Error>) -> Void)
   func callFlutterEchoNullable(
     _ anEnum: AnEnum?, completion: @escaping (Result<AnEnum?, Error>) -> Void)
   func callFlutterEchoNullable(
@@ -1225,6 +1306,44 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoClassListChannel.setMessageHandler(nil)
     }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg = args[0] as! [AnEnum]
+        do {
+          let result = try api.echoNonNull(enumList: enumListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg = args[0] as! [AllNullableTypes]
+        do {
+          let result = try api.echoNonNull(classList: classListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullClassListChannel.setMessageHandler(nil)
+    }
     /// Returns the passed map, to test serialization and deserialization.
     let echoMapChannel = FlutterBasicMessageChannel(
       name:
@@ -1320,6 +1439,82 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoClassMapChannel.setMessageHandler(nil)
     }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg = args[0] as! [String: String]
+        do {
+          let result = try api.echoNonNull(stringMap: stringMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg = args[0] as! [Int64: Int64]
+        do {
+          let result = try api.echoNonNull(intMap: intMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg = args[0] as? [AnEnum: AnEnum]
+        do {
+          let result = try api.echoNonNull(enumMap: enumMapArg!)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg = args[0] as! [Int64: AllNullableTypes]
+        do {
+          let result = try api.echoNonNull(classMap: classMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNonNullClassMapChannel.setMessageHandler(nil)
+    }
     /// Returns the passed class to test nested class serialization and deserialization.
     let echoClassWrapperChannel = FlutterBasicMessageChannel(
       name:
@@ -1727,6 +1922,44 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoNullableClassListChannel.setMessageHandler(nil)
     }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNullableNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg: [AnEnum]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(enumList: enumListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed list, to test serialization and deserialization.
+    let echoNullableNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg: [AllNullableTypes]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(classList: classListArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullClassListChannel.setMessageHandler(nil)
+    }
     /// Returns the passed map, to test serialization and deserialization.
     let echoNullableMapChannel = FlutterBasicMessageChannel(
       name:
@@ -1822,6 +2055,82 @@ class HostIntegrationCoreApiSetup {
     } else {
       echoNullableClassMapChannel.setMessageHandler(nil)
     }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg: [String: String]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(stringMap: stringMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg: [Int64: Int64]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(intMap: intMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg: [AnEnum: AnEnum]? = args[0] as? [AnEnum: AnEnum]
+        do {
+          let result = try api.echoNullableNonNull(enumMap: enumMapArg!)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    /// Returns the passed map, to test serialization and deserialization.
+    let echoNullableNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      echoNullableNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg: [Int64: AllNullableTypes]? = nilOrValue(args[0])
+        do {
+          let result = try api.echoNullableNonNull(classMap: classMapArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      echoNullableNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let echoNullableEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum\(channelSuffix)",
@@ -3031,6 +3340,46 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoClassListChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg = args[0] as! [AnEnum]
+        api.callFlutterEchoNonNull(enumList: enumListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg = args[0] as! [AllNullableTypes]
+        api.callFlutterEchoNonNull(classList: classListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullClassListChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoMapChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap\(channelSuffix)",
@@ -3131,6 +3480,86 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoClassMapChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg = args[0] as! [String: String]
+        api.callFlutterEchoNonNull(stringMap: stringMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg = args[0] as! [Int64: Int64]
+        api.callFlutterEchoNonNull(intMap: intMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg = args[0] as? [AnEnum: AnEnum]
+        api.callFlutterEchoNonNull(enumMap: enumMapArg!) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg = args[0] as! [Int64: AllNullableTypes]
+        api.callFlutterEchoNonNull(classMap: classMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum\(channelSuffix)",
@@ -3331,6 +3760,46 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoNullableClassListChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNullableNonNullEnumListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullEnumListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumListArg: [AnEnum]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(enumList: enumListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullEnumListChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullClassListChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassList\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullClassListChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classListArg: [AllNullableTypes]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(classList: classListArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullClassListChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap\(channelSuffix)",
@@ -3431,6 +3900,86 @@ class HostIntegrationCoreApiSetup {
     } else {
       callFlutterEchoNullableClassMapChannel.setMessageHandler(nil)
     }
+    let callFlutterEchoNullableNonNullStringMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullStringMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullStringMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let stringMapArg: [String: String]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(stringMap: stringMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullStringMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullIntMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullIntMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullIntMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let intMapArg: [Int64: Int64]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(intMap: intMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullIntMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullEnumMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullEnumMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullEnumMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let enumMapArg: [AnEnum: AnEnum]? = args[0] as? [AnEnum: AnEnum]
+        api.callFlutterEchoNullableNonNull(enumMap: enumMapArg!) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullEnumMapChannel.setMessageHandler(nil)
+    }
+    let callFlutterEchoNullableNonNullClassMapChannel = FlutterBasicMessageChannel(
+      name:
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableNonNullClassMap\(channelSuffix)",
+      binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      callFlutterEchoNullableNonNullClassMapChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let classMapArg: [Int64: AllNullableTypes]? = nilOrValue(args[0])
+        api.callFlutterEchoNullableNonNull(classMap: classMapArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      callFlutterEchoNullableNonNullClassMapChannel.setMessageHandler(nil)
+    }
     let callFlutterEchoNullableEnumChannel = FlutterBasicMessageChannel(
       name:
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum\(channelSuffix)",
@@ -3551,6 +4100,13 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echo(
     classList classListArg: [AllNullableTypes?],
     completion: @escaping (Result<[AllNullableTypes?], PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    enumList enumListArg: [AnEnum], completion: @escaping (Result<[AnEnum], PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    classList classListArg: [AllNullableTypes],
+    completion: @escaping (Result<[AllNullableTypes], PigeonError>) -> Void)
   /// Returns the passed map, to test serialization and deserialization.
   func echo(
     _ mapArg: [AnyHashable?: Any?],
@@ -3571,6 +4127,22 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echo(
     classMap classMapArg: [Int64?: AllNullableTypes?],
     completion: @escaping (Result<[Int64?: AllNullableTypes?], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    stringMap stringMapArg: [String: String],
+    completion: @escaping (Result<[String: String], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    intMap intMapArg: [Int64: Int64],
+    completion: @escaping (Result<[Int64: Int64], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum],
+    completion: @escaping (Result<[AnEnum: AnEnum], PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
   func echo(_ anEnumArg: AnEnum, completion: @escaping (Result<AnEnum, PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
@@ -3601,6 +4173,13 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echoNullable(
     classList classListArg: [AllNullableTypes?]?,
     completion: @escaping (Result<[AllNullableTypes?]?, PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumList enumListArg: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, PigeonError>) -> Void)
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classList classListArg: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, PigeonError>) -> Void)
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(
     _ mapArg: [AnyHashable?: Any?]?,
@@ -3621,6 +4200,22 @@ protocol FlutterIntegrationCoreApiProtocol {
   func echoNullable(
     classMap classMapArg: [Int64?: AllNullableTypes?]?,
     completion: @escaping (Result<[Int64?: AllNullableTypes?]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    stringMap stringMapArg: [String: String]?,
+    completion: @escaping (Result<[String: String]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    intMap intMapArg: [Int64: Int64]?,
+    completion: @escaping (Result<[Int64: Int64]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum]?,
+    completion: @escaping (Result<[AnEnum: AnEnum]?, PigeonError>) -> Void)
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, PigeonError>) -> Void)
   /// Returns the passed enum to test serialization and deserialization.
   func echoNullable(
     _ anEnumArg: AnEnum?, completion: @escaping (Result<AnEnum?, PigeonError>) -> Void)
@@ -4091,6 +4686,67 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    enumList enumListArg: [AnEnum], completion: @escaping (Result<[AnEnum], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [AnEnum]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNonNull(
+    classList classListArg: [AllNullableTypes],
+    completion: @escaping (Result<[AllNullableTypes], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [AllNullableTypes]
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   func echo(
     _ mapArg: [AnyHashable?: Any?],
@@ -4246,6 +4902,130 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    stringMap stringMapArg: [String: String],
+    completion: @escaping (Result<[String: String], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([stringMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [String: String]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    intMap intMapArg: [Int64: Int64],
+    completion: @escaping (Result<[Int64: Int64], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([intMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [Int64: Int64]
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum],
+    completion: @escaping (Result<[AnEnum: AnEnum], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as? [AnEnum: AnEnum]
+        completion(.success(result!))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else if listResponse[0] == nil {
+        completion(
+          .failure(
+            PigeonError(
+              code: "null-error",
+              message: "Flutter api returned null value for non-null return value.", details: "")))
+      } else {
+        let result = listResponse[0] as! [Int64: AllNullableTypes]
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed enum to test serialization and deserialization.
   func echo(_ anEnumArg: AnEnum, completion: @escaping (Result<AnEnum, PigeonError>) -> Void) {
     let channelName: String =
@@ -4496,6 +5276,55 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumList enumListArg: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AnEnum]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed list, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classList classListArg: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classListArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AllNullableTypes]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed map, to test serialization and deserialization.
   func echoNullable(
     _ mapArg: [AnyHashable?: Any?]?,
@@ -4621,6 +5450,106 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol {
       }
     }
   }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    stringMap stringMapArg: [String: String]?,
+    completion: @escaping (Result<[String: String]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([stringMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [String: String]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    intMap intMapArg: [Int64: Int64]?,
+    completion: @escaping (Result<[Int64: Int64]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([intMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [Int64: Int64]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    enumMap enumMapArg: [AnEnum: AnEnum]?,
+    completion: @escaping (Result<[AnEnum: AnEnum]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([enumMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [AnEnum: AnEnum]? = listResponse[0] as? [AnEnum: AnEnum]
+        completion(.success(result!))
+      }
+    }
+  }
+  /// Returns the passed map, to test serialization and deserialization.
+  func echoNullableNonNull(
+    classMap classMapArg: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, PigeonError>) -> Void
+  ) {
+    let channelName: String =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap\(messageChannelSuffix)"
+    let channel = FlutterBasicMessageChannel(
+      name: channelName, binaryMessenger: binaryMessenger, codec: codec)
+    channel.sendMessage([classMapArg] as [Any?]) { response in
+      guard let listResponse = response as? [Any?] else {
+        completion(.failure(createConnectionError(withChannelName: channelName)))
+        return
+      }
+      if listResponse.count > 1 {
+        let code: String = listResponse[0] as! String
+        let message: String? = nilOrValue(listResponse[1])
+        let details: String? = nilOrValue(listResponse[2])
+        completion(.failure(PigeonError(code: code, message: message, details: details)))
+      } else {
+        let result: [Int64: AllNullableTypes]? = nilOrValue(listResponse[0])
+        completion(.success(result))
+      }
+    }
+  }
   /// Returns the passed enum to test serialization and deserialization.
   func echoNullable(
     _ anEnumArg: AnEnum?, completion: @escaping (Result<AnEnum?, PigeonError>) -> Void
diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift
index 0691114ce27..3244d62b838 100644
--- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift
+++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift
@@ -94,6 +94,14 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  func echoNonNull(enumList: [AnEnum]) throws -> [AnEnum] {
+    return enumList
+  }
+
+  func echoNonNull(classList: [AllNullableTypes]) throws -> [AllNullableTypes] {
+    return classList
+  }
+
   func echo(_ map: [AnyHashable?: Any?]) throws -> [AnyHashable?: Any?] {
     return map
   }
@@ -114,6 +122,22 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  func echoNonNull(stringMap: [String: String]) throws -> [String: String] {
+    return stringMap
+  }
+
+  func echoNonNull(intMap: [Int64: Int64]) throws -> [Int64: Int64] {
+    return intMap
+  }
+
+  func echoNonNull(enumMap: [AnEnum: AnEnum]) throws -> [AnEnum: AnEnum] {
+    return enumMap
+  }
+
+  func echoNonNull(classMap: [Int64: AllNullableTypes]) throws -> [Int64: AllNullableTypes] {
+    return classMap
+  }
+
   func echo(_ wrapper: AllClassesWrapper) throws -> AllClassesWrapper {
     return wrapper
   }
@@ -200,6 +224,14 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classList
   }
 
+  func echoNullableNonNull(enumList: [AnEnum]?) throws -> [AnEnum]? {
+    return enumList
+  }
+
+  func echoNullableNonNull(classList: [AllNullableTypes]?) throws -> [AllNullableTypes]? {
+    return classList
+  }
+
   func echoNullable(_ map: [AnyHashable?: Any?]?) throws -> [AnyHashable?: Any?]? {
     return map
   }
@@ -220,6 +252,24 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     return classMap
   }
 
+  func echoNullableNonNull(stringMap: [String: String]?) throws -> [String: String]? {
+    return stringMap
+  }
+
+  func echoNullableNonNull(intMap: [Int64: Int64]?) throws -> [Int64: Int64]? {
+    return intMap
+  }
+
+  func echoNullableNonNull(enumMap: [AnEnum: AnEnum]?) throws -> [AnEnum: AnEnum]? {
+    return enumMap
+  }
+
+  func echoNullableNonNull(classMap: [Int64: AllNullableTypes]?) throws -> [Int64:
+    AllNullableTypes]?
+  {
+    return classMap
+  }
+
   func echoNullable(_ anEnum: AnEnum?) throws -> AnEnum? {
     return anEnum
   }
@@ -652,6 +702,32 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNonNull(
+    enumList: [AnEnum], completion: @escaping (Result<[AnEnum], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(enumList: enumList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    classList: [AllNullableTypes], completion: @escaping (Result<[AllNullableTypes], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(classList: classList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEcho(
     _ map: [AnyHashable?: Any?], completion: @escaping (Result<[AnyHashable?: Any?], Error>) -> Void
   ) {
@@ -718,6 +794,59 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNonNull(
+    stringMap: [String: String], completion: @escaping (Result<[String: String], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(stringMap: stringMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    intMap: [Int64: Int64], completion: @escaping (Result<[Int64: Int64], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(intMap: intMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    enumMap: [AnEnum: AnEnum], completion: @escaping (Result<[AnEnum: AnEnum], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(enumMap: enumMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNonNull(
+    classMap: [Int64: AllNullableTypes],
+    completion: @escaping (Result<[Int64: AllNullableTypes], Error>) -> Void
+  ) {
+    flutterAPI.echoNonNull(classMap: classMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEcho(
     _ anEnum: AnEnum, completion: @escaping (Result<AnEnum, Error>) -> Void
   ) {
@@ -849,6 +978,33 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNullableNonNull(
+    enumList: [AnEnum]?, completion: @escaping (Result<[AnEnum]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(enumList: enumList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    classList: [AllNullableTypes]?,
+    completion: @escaping (Result<[AllNullableTypes]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(classList: classList) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEchoNullable(
     _ map: [AnyHashable?: Any?]?,
     completion: @escaping (Result<[AnyHashable?: Any?]?, Error>) -> Void
@@ -917,6 +1073,59 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
     }
   }
 
+  func callFlutterEchoNullableNonNull(
+    stringMap: [String: String]?, completion: @escaping (Result<[String: String]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(stringMap: stringMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    intMap: [Int64: Int64]?, completion: @escaping (Result<[Int64: Int64]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(intMap: intMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    enumMap: [AnEnum: AnEnum]?, completion: @escaping (Result<[AnEnum: AnEnum]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(enumMap: enumMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
+  func callFlutterEchoNullableNonNull(
+    classMap: [Int64: AllNullableTypes]?,
+    completion: @escaping (Result<[Int64: AllNullableTypes]?, Error>) -> Void
+  ) {
+    flutterAPI.echoNullableNonNull(classMap: classMap) { response in
+      switch response {
+      case .success(let res):
+        completion(.success(res))
+      case .failure(let error):
+        completion(.failure(error))
+      }
+    }
+  }
+
   func callFlutterEchoNullable(
     _ anEnum: AnEnum?, completion: @escaping (Result<AnEnum?, Error>) -> Void
   ) {
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
index a1336024757..c6f293b3d07 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
+++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
@@ -83,9 +83,10 @@ AllTypes::AllTypes(bool a_bool, int64_t an_int, int64_t an_int64,
                    const EncodableList& double_list,
                    const EncodableList& bool_list,
                    const EncodableList& enum_list,
+                   const EncodableList& object_list,
                    const EncodableList& list_list, const EncodableMap& map,
                    const EncodableMap& string_map, const EncodableMap& int_map,
-                   const EncodableMap& enum_map)
+                   const EncodableMap& enum_map, const EncodableMap& object_map)
     : a_bool_(a_bool),
       an_int_(an_int),
       an_int64_(an_int64),
@@ -104,11 +105,13 @@ AllTypes::AllTypes(bool a_bool, int64_t an_int, int64_t an_int64,
       double_list_(double_list),
       bool_list_(bool_list),
       enum_list_(enum_list),
+      object_list_(object_list),
       list_list_(list_list),
       map_(map),
       string_map_(string_map),
       int_map_(int_map),
-      enum_map_(enum_map) {}
+      enum_map_(enum_map),
+      object_map_(object_map) {}
 
 bool AllTypes::a_bool() const { return a_bool_; }
 
@@ -214,6 +217,12 @@ void AllTypes::set_enum_list(const EncodableList& value_arg) {
   enum_list_ = value_arg;
 }
 
+const EncodableList& AllTypes::object_list() const { return object_list_; }
+
+void AllTypes::set_object_list(const EncodableList& value_arg) {
+  object_list_ = value_arg;
+}
+
 const EncodableList& AllTypes::list_list() const { return list_list_; }
 
 void AllTypes::set_list_list(const EncodableList& value_arg) {
@@ -242,9 +251,15 @@ void AllTypes::set_enum_map(const EncodableMap& value_arg) {
   enum_map_ = value_arg;
 }
 
+const EncodableMap& AllTypes::object_map() const { return object_map_; }
+
+void AllTypes::set_object_map(const EncodableMap& value_arg) {
+  object_map_ = value_arg;
+}
+
 EncodableList AllTypes::ToEncodableList() const {
   EncodableList list;
-  list.reserve(23);
+  list.reserve(25);
   list.push_back(EncodableValue(a_bool_));
   list.push_back(EncodableValue(an_int_));
   list.push_back(EncodableValue(an_int64_));
@@ -263,11 +278,13 @@ EncodableList AllTypes::ToEncodableList() const {
   list.push_back(EncodableValue(double_list_));
   list.push_back(EncodableValue(bool_list_));
   list.push_back(EncodableValue(enum_list_));
+  list.push_back(EncodableValue(object_list_));
   list.push_back(EncodableValue(list_list_));
   list.push_back(EncodableValue(map_));
   list.push_back(EncodableValue(string_map_));
   list.push_back(EncodableValue(int_map_));
   list.push_back(EncodableValue(enum_map_));
+  list.push_back(EncodableValue(object_map_));
   return list;
 }
 
@@ -286,9 +303,10 @@ AllTypes AllTypes::FromEncodableList(const EncodableList& list) {
       std::get<EncodableList>(list[12]), std::get<EncodableList>(list[13]),
       std::get<EncodableList>(list[14]), std::get<EncodableList>(list[15]),
       std::get<EncodableList>(list[16]), std::get<EncodableList>(list[17]),
-      std::get<EncodableList>(list[18]), std::get<EncodableMap>(list[19]),
+      std::get<EncodableList>(list[18]), std::get<EncodableList>(list[19]),
       std::get<EncodableMap>(list[20]), std::get<EncodableMap>(list[21]),
-      std::get<EncodableMap>(list[22]));
+      std::get<EncodableMap>(list[22]), std::get<EncodableMap>(list[23]),
+      std::get<EncodableMap>(list[24]));
   return decoded;
 }
 
@@ -309,10 +327,11 @@ AllNullableTypes::AllNullableTypes(
     const AllNullableTypes* all_nullable_types, const EncodableList* list,
     const EncodableList* string_list, const EncodableList* int_list,
     const EncodableList* double_list, const EncodableList* bool_list,
-    const EncodableList* enum_list, const EncodableList* list_list,
-    const EncodableList* recursive_class_list, const EncodableMap* map,
-    const EncodableMap* string_map, const EncodableMap* int_map,
-    const EncodableMap* enum_map, const EncodableMap* recursive_class_map)
+    const EncodableList* enum_list, const EncodableList* object_list,
+    const EncodableList* list_list, const EncodableList* recursive_class_list,
+    const EncodableMap* map, const EncodableMap* string_map,
+    const EncodableMap* int_map, const EncodableMap* enum_map,
+    const EncodableMap* object_map, const EncodableMap* recursive_class_map)
     : a_nullable_bool_(a_nullable_bool ? std::optional<bool>(*a_nullable_bool)
                                        : std::nullopt),
       a_nullable_int_(a_nullable_int ? std::optional<int64_t>(*a_nullable_int)
@@ -365,6 +384,8 @@ AllNullableTypes::AllNullableTypes(
                            : std::nullopt),
       enum_list_(enum_list ? std::optional<EncodableList>(*enum_list)
                            : std::nullopt),
+      object_list_(object_list ? std::optional<EncodableList>(*object_list)
+                               : std::nullopt),
       list_list_(list_list ? std::optional<EncodableList>(*list_list)
                            : std::nullopt),
       recursive_class_list_(recursive_class_list ? std::optional<EncodableList>(
@@ -376,6 +397,8 @@ AllNullableTypes::AllNullableTypes(
       int_map_(int_map ? std::optional<EncodableMap>(*int_map) : std::nullopt),
       enum_map_(enum_map ? std::optional<EncodableMap>(*enum_map)
                          : std::nullopt),
+      object_map_(object_map ? std::optional<EncodableMap>(*object_map)
+                             : std::nullopt),
       recursive_class_map_(recursive_class_map ? std::optional<EncodableMap>(
                                                      *recursive_class_map)
                                                : std::nullopt) {}
@@ -444,6 +467,9 @@ AllNullableTypes::AllNullableTypes(const AllNullableTypes& other)
       enum_list_(other.enum_list_
                      ? std::optional<EncodableList>(*other.enum_list_)
                      : std::nullopt),
+      object_list_(other.object_list_
+                       ? std::optional<EncodableList>(*other.object_list_)
+                       : std::nullopt),
       list_list_(other.list_list_
                      ? std::optional<EncodableList>(*other.list_list_)
                      : std::nullopt),
@@ -460,6 +486,9 @@ AllNullableTypes::AllNullableTypes(const AllNullableTypes& other)
                               : std::nullopt),
       enum_map_(other.enum_map_ ? std::optional<EncodableMap>(*other.enum_map_)
                                 : std::nullopt),
+      object_map_(other.object_map_
+                      ? std::optional<EncodableMap>(*other.object_map_)
+                      : std::nullopt),
       recursive_class_map_(
           other.recursive_class_map_
               ? std::optional<EncodableMap>(*other.recursive_class_map_)
@@ -488,12 +517,14 @@ AllNullableTypes& AllNullableTypes::operator=(const AllNullableTypes& other) {
   double_list_ = other.double_list_;
   bool_list_ = other.bool_list_;
   enum_list_ = other.enum_list_;
+  object_list_ = other.object_list_;
   list_list_ = other.list_list_;
   recursive_class_list_ = other.recursive_class_list_;
   map_ = other.map_;
   string_map_ = other.string_map_;
   int_map_ = other.int_map_;
   enum_map_ = other.enum_map_;
+  object_map_ = other.object_map_;
   recursive_class_map_ = other.recursive_class_map_;
   return *this;
 }
@@ -757,6 +788,19 @@ void AllNullableTypes::set_enum_list(const EncodableList& value_arg) {
   enum_list_ = value_arg;
 }
 
+const EncodableList* AllNullableTypes::object_list() const {
+  return object_list_ ? &(*object_list_) : nullptr;
+}
+
+void AllNullableTypes::set_object_list(const EncodableList* value_arg) {
+  object_list_ =
+      value_arg ? std::optional<EncodableList>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypes::set_object_list(const EncodableList& value_arg) {
+  object_list_ = value_arg;
+}
+
 const EncodableList* AllNullableTypes::list_list() const {
   return list_list_ ? &(*list_list_) : nullptr;
 }
@@ -835,6 +879,19 @@ void AllNullableTypes::set_enum_map(const EncodableMap& value_arg) {
   enum_map_ = value_arg;
 }
 
+const EncodableMap* AllNullableTypes::object_map() const {
+  return object_map_ ? &(*object_map_) : nullptr;
+}
+
+void AllNullableTypes::set_object_map(const EncodableMap* value_arg) {
+  object_map_ =
+      value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypes::set_object_map(const EncodableMap& value_arg) {
+  object_map_ = value_arg;
+}
+
 const EncodableMap* AllNullableTypes::recursive_class_map() const {
   return recursive_class_map_ ? &(*recursive_class_map_) : nullptr;
 }
@@ -850,7 +907,7 @@ void AllNullableTypes::set_recursive_class_map(const EncodableMap& value_arg) {
 
 EncodableList AllNullableTypes::ToEncodableList() const {
   EncodableList list;
-  list.reserve(26);
+  list.reserve(28);
   list.push_back(a_nullable_bool_ ? EncodableValue(*a_nullable_bool_)
                                   : EncodableValue());
   list.push_back(a_nullable_int_ ? EncodableValue(*a_nullable_int_)
@@ -890,6 +947,8 @@ EncodableList AllNullableTypes::ToEncodableList() const {
                               : EncodableValue());
   list.push_back(bool_list_ ? EncodableValue(*bool_list_) : EncodableValue());
   list.push_back(enum_list_ ? EncodableValue(*enum_list_) : EncodableValue());
+  list.push_back(object_list_ ? EncodableValue(*object_list_)
+                              : EncodableValue());
   list.push_back(list_list_ ? EncodableValue(*list_list_) : EncodableValue());
   list.push_back(recursive_class_list_ ? EncodableValue(*recursive_class_list_)
                                        : EncodableValue());
@@ -897,6 +956,7 @@ EncodableList AllNullableTypes::ToEncodableList() const {
   list.push_back(string_map_ ? EncodableValue(*string_map_) : EncodableValue());
   list.push_back(int_map_ ? EncodableValue(*int_map_) : EncodableValue());
   list.push_back(enum_map_ ? EncodableValue(*enum_map_) : EncodableValue());
+  list.push_back(object_map_ ? EncodableValue(*object_map_) : EncodableValue());
   list.push_back(recursive_class_map_ ? EncodableValue(*recursive_class_map_)
                                       : EncodableValue());
   return list;
@@ -990,32 +1050,40 @@ AllNullableTypes AllNullableTypes::FromEncodableList(
   if (!encodable_enum_list.IsNull()) {
     decoded.set_enum_list(std::get<EncodableList>(encodable_enum_list));
   }
-  auto& encodable_list_list = list[19];
+  auto& encodable_object_list = list[19];
+  if (!encodable_object_list.IsNull()) {
+    decoded.set_object_list(std::get<EncodableList>(encodable_object_list));
+  }
+  auto& encodable_list_list = list[20];
   if (!encodable_list_list.IsNull()) {
     decoded.set_list_list(std::get<EncodableList>(encodable_list_list));
   }
-  auto& encodable_recursive_class_list = list[20];
+  auto& encodable_recursive_class_list = list[21];
   if (!encodable_recursive_class_list.IsNull()) {
     decoded.set_recursive_class_list(
         std::get<EncodableList>(encodable_recursive_class_list));
   }
-  auto& encodable_map = list[21];
+  auto& encodable_map = list[22];
   if (!encodable_map.IsNull()) {
     decoded.set_map(std::get<EncodableMap>(encodable_map));
   }
-  auto& encodable_string_map = list[22];
+  auto& encodable_string_map = list[23];
   if (!encodable_string_map.IsNull()) {
     decoded.set_string_map(std::get<EncodableMap>(encodable_string_map));
   }
-  auto& encodable_int_map = list[23];
+  auto& encodable_int_map = list[24];
   if (!encodable_int_map.IsNull()) {
     decoded.set_int_map(std::get<EncodableMap>(encodable_int_map));
   }
-  auto& encodable_enum_map = list[24];
+  auto& encodable_enum_map = list[25];
   if (!encodable_enum_map.IsNull()) {
     decoded.set_enum_map(std::get<EncodableMap>(encodable_enum_map));
   }
-  auto& encodable_recursive_class_map = list[25];
+  auto& encodable_object_map = list[26];
+  if (!encodable_object_map.IsNull()) {
+    decoded.set_object_map(std::get<EncodableMap>(encodable_object_map));
+  }
+  auto& encodable_recursive_class_map = list[27];
   if (!encodable_recursive_class_map.IsNull()) {
     decoded.set_recursive_class_map(
         std::get<EncodableMap>(encodable_recursive_class_map));
@@ -1039,9 +1107,10 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
     const EncodableValue* a_nullable_object, const EncodableList* list,
     const EncodableList* string_list, const EncodableList* int_list,
     const EncodableList* double_list, const EncodableList* bool_list,
-    const EncodableList* enum_list, const EncodableList* list_list,
-    const EncodableMap* map, const EncodableMap* string_map,
-    const EncodableMap* int_map, const EncodableMap* enum_map)
+    const EncodableList* enum_list, const EncodableList* object_list,
+    const EncodableList* list_list, const EncodableMap* map,
+    const EncodableMap* string_map, const EncodableMap* int_map,
+    const EncodableMap* enum_map, const EncodableMap* object_map)
     : a_nullable_bool_(a_nullable_bool ? std::optional<bool>(*a_nullable_bool)
                                        : std::nullopt),
       a_nullable_int_(a_nullable_int ? std::optional<int64_t>(*a_nullable_int)
@@ -1090,6 +1159,8 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
                            : std::nullopt),
       enum_list_(enum_list ? std::optional<EncodableList>(*enum_list)
                            : std::nullopt),
+      object_list_(object_list ? std::optional<EncodableList>(*object_list)
+                               : std::nullopt),
       list_list_(list_list ? std::optional<EncodableList>(*list_list)
                            : std::nullopt),
       map_(map ? std::optional<EncodableMap>(*map) : std::nullopt),
@@ -1097,7 +1168,9 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
                              : std::nullopt),
       int_map_(int_map ? std::optional<EncodableMap>(*int_map) : std::nullopt),
       enum_map_(enum_map ? std::optional<EncodableMap>(*enum_map)
-                         : std::nullopt) {}
+                         : std::nullopt),
+      object_map_(object_map ? std::optional<EncodableMap>(*object_map)
+                             : std::nullopt) {}
 
 const bool* AllNullableTypesWithoutRecursion::a_nullable_bool() const {
   return a_nullable_bool_ ? &(*a_nullable_bool_) : nullptr;
@@ -1372,6 +1445,21 @@ void AllNullableTypesWithoutRecursion::set_enum_list(
   enum_list_ = value_arg;
 }
 
+const EncodableList* AllNullableTypesWithoutRecursion::object_list() const {
+  return object_list_ ? &(*object_list_) : nullptr;
+}
+
+void AllNullableTypesWithoutRecursion::set_object_list(
+    const EncodableList* value_arg) {
+  object_list_ =
+      value_arg ? std::optional<EncodableList>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypesWithoutRecursion::set_object_list(
+    const EncodableList& value_arg) {
+  object_list_ = value_arg;
+}
+
 const EncodableList* AllNullableTypesWithoutRecursion::list_list() const {
   return list_list_ ? &(*list_list_) : nullptr;
 }
@@ -1443,9 +1531,24 @@ void AllNullableTypesWithoutRecursion::set_enum_map(
   enum_map_ = value_arg;
 }
 
+const EncodableMap* AllNullableTypesWithoutRecursion::object_map() const {
+  return object_map_ ? &(*object_map_) : nullptr;
+}
+
+void AllNullableTypesWithoutRecursion::set_object_map(
+    const EncodableMap* value_arg) {
+  object_map_ =
+      value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypesWithoutRecursion::set_object_map(
+    const EncodableMap& value_arg) {
+  object_map_ = value_arg;
+}
+
 EncodableList AllNullableTypesWithoutRecursion::ToEncodableList() const {
   EncodableList list;
-  list.reserve(23);
+  list.reserve(25);
   list.push_back(a_nullable_bool_ ? EncodableValue(*a_nullable_bool_)
                                   : EncodableValue());
   list.push_back(a_nullable_int_ ? EncodableValue(*a_nullable_int_)
@@ -1482,11 +1585,14 @@ EncodableList AllNullableTypesWithoutRecursion::ToEncodableList() const {
                               : EncodableValue());
   list.push_back(bool_list_ ? EncodableValue(*bool_list_) : EncodableValue());
   list.push_back(enum_list_ ? EncodableValue(*enum_list_) : EncodableValue());
+  list.push_back(object_list_ ? EncodableValue(*object_list_)
+                              : EncodableValue());
   list.push_back(list_list_ ? EncodableValue(*list_list_) : EncodableValue());
   list.push_back(map_ ? EncodableValue(*map_) : EncodableValue());
   list.push_back(string_map_ ? EncodableValue(*string_map_) : EncodableValue());
   list.push_back(int_map_ ? EncodableValue(*int_map_) : EncodableValue());
   list.push_back(enum_map_ ? EncodableValue(*enum_map_) : EncodableValue());
+  list.push_back(object_map_ ? EncodableValue(*object_map_) : EncodableValue());
   return list;
 }
 
@@ -1573,26 +1679,34 @@ AllNullableTypesWithoutRecursion::FromEncodableList(const EncodableList& list) {
   if (!encodable_enum_list.IsNull()) {
     decoded.set_enum_list(std::get<EncodableList>(encodable_enum_list));
   }
-  auto& encodable_list_list = list[18];
+  auto& encodable_object_list = list[18];
+  if (!encodable_object_list.IsNull()) {
+    decoded.set_object_list(std::get<EncodableList>(encodable_object_list));
+  }
+  auto& encodable_list_list = list[19];
   if (!encodable_list_list.IsNull()) {
     decoded.set_list_list(std::get<EncodableList>(encodable_list_list));
   }
-  auto& encodable_map = list[19];
+  auto& encodable_map = list[20];
   if (!encodable_map.IsNull()) {
     decoded.set_map(std::get<EncodableMap>(encodable_map));
   }
-  auto& encodable_string_map = list[20];
+  auto& encodable_string_map = list[21];
   if (!encodable_string_map.IsNull()) {
     decoded.set_string_map(std::get<EncodableMap>(encodable_string_map));
   }
-  auto& encodable_int_map = list[21];
+  auto& encodable_int_map = list[22];
   if (!encodable_int_map.IsNull()) {
     decoded.set_int_map(std::get<EncodableMap>(encodable_int_map));
   }
-  auto& encodable_enum_map = list[22];
+  auto& encodable_enum_map = list[23];
   if (!encodable_enum_map.IsNull()) {
     decoded.set_enum_map(std::get<EncodableMap>(encodable_enum_map));
   }
+  auto& encodable_object_map = list[24];
+  if (!encodable_object_map.IsNull()) {
+    decoded.set_object_map(std::get<EncodableMap>(encodable_object_map));
+  }
   return decoded;
 }
 
@@ -2450,6 +2564,79 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
       channel.SetMessageHandler(nullptr);
     }
   }
+  {
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoNonNullEnumList" +
+                                      prepended_suffix,
+                                  &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_list_arg = args.at(0);
+              if (encodable_enum_list_arg.IsNull()) {
+                reply(WrapError("enum_list_arg unexpectedly null."));
+                return;
+              }
+              const auto& enum_list_arg =
+                  std::get<EncodableList>(encodable_enum_list_arg);
+              ErrorOr<EncodableList> output =
+                  api->EchoNonNullEnumList(enum_list_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNonNullClassList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_list_arg = args.at(0);
+              if (encodable_class_list_arg.IsNull()) {
+                reply(WrapError("class_list_arg unexpectedly null."));
+                return;
+              }
+              const auto& class_list_arg =
+                  std::get<EncodableList>(encodable_class_list_arg);
+              ErrorOr<EncodableList> output =
+                  api->EchoNonNullClassList(class_list_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
@@ -2625,33 +2812,33 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(binary_messenger,
-                                  "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.echoClassWrapper" +
-                                      prepended_suffix,
-                                  &GetCodec());
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNonNullStringMap" +
+            prepended_suffix,
+        &GetCodec());
     if (api != nullptr) {
       channel.SetMessageHandler(
           [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_wrapper_arg = args.at(0);
-              if (encodable_wrapper_arg.IsNull()) {
-                reply(WrapError("wrapper_arg unexpectedly null."));
+              const auto& encodable_string_map_arg = args.at(0);
+              if (encodable_string_map_arg.IsNull()) {
+                reply(WrapError("string_map_arg unexpectedly null."));
                 return;
               }
-              const auto& wrapper_arg = std::any_cast<const AllClassesWrapper&>(
-                  std::get<CustomEncodableValue>(encodable_wrapper_arg));
-              ErrorOr<AllClassesWrapper> output =
-                  api->EchoClassWrapper(wrapper_arg);
+              const auto& string_map_arg =
+                  std::get<EncodableMap>(encodable_string_map_arg);
+              ErrorOr<EncodableMap> output =
+                  api->EchoNonNullStringMap(string_map_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
               }
               EncodableList wrapped;
-              wrapped.push_back(
-                  CustomEncodableValue(std::move(output).TakeValue()));
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
               reply(EncodableValue(std::move(wrapped)));
             } catch (const std::exception& exception) {
               reply(WrapError(exception.what()));
@@ -2664,7 +2851,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.echoEnum" +
+                                  "HostIntegrationCoreApi.echoNonNullIntMap" +
                                       prepended_suffix,
                                   &GetCodec());
     if (api != nullptr) {
@@ -2673,21 +2860,21 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_an_enum_arg = args.at(0);
-              if (encodable_an_enum_arg.IsNull()) {
-                reply(WrapError("an_enum_arg unexpectedly null."));
+              const auto& encodable_int_map_arg = args.at(0);
+              if (encodable_int_map_arg.IsNull()) {
+                reply(WrapError("int_map_arg unexpectedly null."));
                 return;
               }
-              const auto& an_enum_arg = std::any_cast<const AnEnum&>(
-                  std::get<CustomEncodableValue>(encodable_an_enum_arg));
-              ErrorOr<AnEnum> output = api->EchoEnum(an_enum_arg);
+              const auto& int_map_arg =
+                  std::get<EncodableMap>(encodable_int_map_arg);
+              ErrorOr<EncodableMap> output =
+                  api->EchoNonNullIntMap(int_map_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
               }
               EncodableList wrapped;
-              wrapped.push_back(
-                  CustomEncodableValue(std::move(output).TakeValue()));
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
               reply(EncodableValue(std::move(wrapped)));
             } catch (const std::exception& exception) {
               reply(WrapError(exception.what()));
@@ -2700,7 +2887,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.echoAnotherEnum" +
+                                  "HostIntegrationCoreApi.echoNonNullEnumMap" +
                                       prepended_suffix,
                                   &GetCodec());
     if (api != nullptr) {
@@ -2709,22 +2896,21 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_another_enum_arg = args.at(0);
-              if (encodable_another_enum_arg.IsNull()) {
-                reply(WrapError("another_enum_arg unexpectedly null."));
+              const auto& encodable_enum_map_arg = args.at(0);
+              if (encodable_enum_map_arg.IsNull()) {
+                reply(WrapError("enum_map_arg unexpectedly null."));
                 return;
               }
-              const auto& another_enum_arg = std::any_cast<const AnotherEnum&>(
-                  std::get<CustomEncodableValue>(encodable_another_enum_arg));
-              ErrorOr<AnotherEnum> output =
-                  api->EchoAnotherEnum(another_enum_arg);
+              const auto& enum_map_arg =
+                  std::get<EncodableMap>(encodable_enum_map_arg);
+              ErrorOr<EncodableMap> output =
+                  api->EchoNonNullEnumMap(enum_map_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
               }
               EncodableList wrapped;
-              wrapped.push_back(
-                  CustomEncodableValue(std::move(output).TakeValue()));
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
               reply(EncodableValue(std::move(wrapped)));
             } catch (const std::exception& exception) {
               reply(WrapError(exception.what()));
@@ -2735,27 +2921,26 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(
-        binary_messenger,
-        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "echoNamedDefaultString" +
-            prepended_suffix,
-        &GetCodec());
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoNonNullClassMap" +
+                                      prepended_suffix,
+                                  &GetCodec());
     if (api != nullptr) {
       channel.SetMessageHandler(
           [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_a_string_arg = args.at(0);
-              if (encodable_a_string_arg.IsNull()) {
-                reply(WrapError("a_string_arg unexpectedly null."));
+              const auto& encodable_class_map_arg = args.at(0);
+              if (encodable_class_map_arg.IsNull()) {
+                reply(WrapError("class_map_arg unexpectedly null."));
                 return;
               }
-              const auto& a_string_arg =
-                  std::get<std::string>(encodable_a_string_arg);
-              ErrorOr<std::string> output =
-                  api->EchoNamedDefaultString(a_string_arg);
+              const auto& class_map_arg =
+                  std::get<EncodableMap>(encodable_class_map_arg);
+              ErrorOr<EncodableMap> output =
+                  api->EchoNonNullClassMap(class_map_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
@@ -2772,33 +2957,33 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(
-        binary_messenger,
-        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "echoOptionalDefaultDouble" +
-            prepended_suffix,
-        &GetCodec());
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoClassWrapper" +
+                                      prepended_suffix,
+                                  &GetCodec());
     if (api != nullptr) {
       channel.SetMessageHandler(
           [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_a_double_arg = args.at(0);
-              if (encodable_a_double_arg.IsNull()) {
-                reply(WrapError("a_double_arg unexpectedly null."));
+              const auto& encodable_wrapper_arg = args.at(0);
+              if (encodable_wrapper_arg.IsNull()) {
+                reply(WrapError("wrapper_arg unexpectedly null."));
                 return;
               }
-              const auto& a_double_arg =
-                  std::get<double>(encodable_a_double_arg);
-              ErrorOr<double> output =
-                  api->EchoOptionalDefaultDouble(a_double_arg);
+              const auto& wrapper_arg = std::any_cast<const AllClassesWrapper&>(
+                  std::get<CustomEncodableValue>(encodable_wrapper_arg));
+              ErrorOr<AllClassesWrapper> output =
+                  api->EchoClassWrapper(wrapper_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
               }
               EncodableList wrapped;
-              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              wrapped.push_back(
+                  CustomEncodableValue(std::move(output).TakeValue()));
               reply(EncodableValue(std::move(wrapped)));
             } catch (const std::exception& exception) {
               reply(WrapError(exception.what()));
@@ -2811,7 +2996,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.echoRequiredInt" +
+                                  "HostIntegrationCoreApi.echoEnum" +
                                       prepended_suffix,
                                   &GetCodec());
     if (api != nullptr) {
@@ -2820,19 +3005,21 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_an_int_arg = args.at(0);
-              if (encodable_an_int_arg.IsNull()) {
-                reply(WrapError("an_int_arg unexpectedly null."));
+              const auto& encodable_an_enum_arg = args.at(0);
+              if (encodable_an_enum_arg.IsNull()) {
+                reply(WrapError("an_enum_arg unexpectedly null."));
                 return;
               }
-              const int64_t an_int_arg = encodable_an_int_arg.LongValue();
-              ErrorOr<int64_t> output = api->EchoRequiredInt(an_int_arg);
+              const auto& an_enum_arg = std::any_cast<const AnEnum&>(
+                  std::get<CustomEncodableValue>(encodable_an_enum_arg));
+              ErrorOr<AnEnum> output = api->EchoEnum(an_enum_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
               }
               EncodableList wrapped;
-              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              wrapped.push_back(
+                  CustomEncodableValue(std::move(output).TakeValue()));
               reply(EncodableValue(std::move(wrapped)));
             } catch (const std::exception& exception) {
               reply(WrapError(exception.what()));
@@ -2843,15 +3030,160 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(
-        binary_messenger,
-        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "echoAllNullableTypes" +
-            prepended_suffix,
-        &GetCodec());
-    if (api != nullptr) {
-      channel.SetMessageHandler(
-          [api](const EncodableValue& message,
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoAnotherEnum" +
+                                      prepended_suffix,
+                                  &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_another_enum_arg = args.at(0);
+              if (encodable_another_enum_arg.IsNull()) {
+                reply(WrapError("another_enum_arg unexpectedly null."));
+                return;
+              }
+              const auto& another_enum_arg = std::any_cast<const AnotherEnum&>(
+                  std::get<CustomEncodableValue>(encodable_another_enum_arg));
+              ErrorOr<AnotherEnum> output =
+                  api->EchoAnotherEnum(another_enum_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(
+                  CustomEncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNamedDefaultString" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_a_string_arg = args.at(0);
+              if (encodable_a_string_arg.IsNull()) {
+                reply(WrapError("a_string_arg unexpectedly null."));
+                return;
+              }
+              const auto& a_string_arg =
+                  std::get<std::string>(encodable_a_string_arg);
+              ErrorOr<std::string> output =
+                  api->EchoNamedDefaultString(a_string_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoOptionalDefaultDouble" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_a_double_arg = args.at(0);
+              if (encodable_a_double_arg.IsNull()) {
+                reply(WrapError("a_double_arg unexpectedly null."));
+                return;
+              }
+              const auto& a_double_arg =
+                  std::get<double>(encodable_a_double_arg);
+              ErrorOr<double> output =
+                  api->EchoOptionalDefaultDouble(a_double_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoRequiredInt" +
+                                      prepended_suffix,
+                                  &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_an_int_arg = args.at(0);
+              if (encodable_an_int_arg.IsNull()) {
+                reply(WrapError("an_int_arg unexpectedly null."));
+                return;
+              }
+              const int64_t an_int_arg = encodable_an_int_arg.LongValue();
+              ErrorOr<int64_t> output = api->EchoRequiredInt(an_int_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              wrapped.push_back(EncodableValue(std::move(output).TakeValue()));
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoAllNullableTypes" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
@@ -3435,6 +3767,84 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
       channel.SetMessageHandler(nullptr);
     }
   }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNullableNonNullEnumList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_list_arg = args.at(0);
+              const auto* enum_list_arg =
+                  std::get_if<EncodableList>(&encodable_enum_list_arg);
+              ErrorOr<std::optional<EncodableList>> output =
+                  api->EchoNullableNonNullEnumList(enum_list_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    EncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNullableNonNullClassList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_list_arg = args.at(0);
+              const auto* class_list_arg =
+                  std::get_if<EncodableList>(&encodable_class_list_arg);
+              ErrorOr<std::optional<EncodableList>> output =
+                  api->EchoNullableNonNullClassList(class_list_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    EncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
@@ -3628,27 +4038,23 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(binary_messenger,
-                                  "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.echoNullableEnum" +
-                                      prepended_suffix,
-                                  &GetCodec());
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNullableNonNullStringMap" +
+            prepended_suffix,
+        &GetCodec());
     if (api != nullptr) {
       channel.SetMessageHandler(
           [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_an_enum_arg = args.at(0);
-              AnEnum an_enum_arg_value;
-              const AnEnum* an_enum_arg = nullptr;
-              if (!encodable_an_enum_arg.IsNull()) {
-                an_enum_arg_value = std::any_cast<const AnEnum&>(
-                    std::get<CustomEncodableValue>(encodable_an_enum_arg));
-                an_enum_arg = &an_enum_arg_value;
-              }
-              ErrorOr<std::optional<AnEnum>> output = api->EchoNullableEnum(
-                  an_enum_arg ? &(*an_enum_arg) : nullptr);
+              const auto& encodable_string_map_arg = args.at(0);
+              const auto* string_map_arg =
+                  std::get_if<EncodableMap>(&encodable_string_map_arg);
+              ErrorOr<std::optional<EncodableMap>> output =
+                  api->EchoNullableNonNullStringMap(string_map_arg);
               if (output.has_error()) {
                 reply(WrapError(output.error()));
                 return;
@@ -3657,7 +4063,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               auto output_optional = std::move(output).TakeValue();
               if (output_optional) {
                 wrapped.push_back(
-                    CustomEncodableValue(std::move(output_optional).value()));
+                    EncodableValue(std::move(output_optional).value()));
               } else {
                 wrapped.push_back(EncodableValue());
               }
@@ -3674,7 +4080,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "echoAnotherNullableEnum" +
+        "echoNullableNonNullIntMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -3683,7 +4089,167 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_another_enum_arg = args.at(0);
+              const auto& encodable_int_map_arg = args.at(0);
+              const auto* int_map_arg =
+                  std::get_if<EncodableMap>(&encodable_int_map_arg);
+              ErrorOr<std::optional<EncodableMap>> output =
+                  api->EchoNullableNonNullIntMap(int_map_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    EncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNullableNonNullEnumMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_map_arg = args.at(0);
+              const auto* enum_map_arg =
+                  std::get_if<EncodableMap>(&encodable_enum_map_arg);
+              ErrorOr<std::optional<EncodableMap>> output =
+                  api->EchoNullableNonNullEnumMap(enum_map_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    EncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoNullableNonNullClassMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_map_arg = args.at(0);
+              const auto* class_map_arg =
+                  std::get_if<EncodableMap>(&encodable_class_map_arg);
+              ErrorOr<std::optional<EncodableMap>> output =
+                  api->EchoNullableNonNullClassMap(class_map_arg);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    EncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.echoNullableEnum" +
+                                      prepended_suffix,
+                                  &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_an_enum_arg = args.at(0);
+              AnEnum an_enum_arg_value;
+              const AnEnum* an_enum_arg = nullptr;
+              if (!encodable_an_enum_arg.IsNull()) {
+                an_enum_arg_value = std::any_cast<const AnEnum&>(
+                    std::get<CustomEncodableValue>(encodable_an_enum_arg));
+                an_enum_arg = &an_enum_arg_value;
+              }
+              ErrorOr<std::optional<AnEnum>> output = api->EchoNullableEnum(
+                  an_enum_arg ? &(*an_enum_arg) : nullptr);
+              if (output.has_error()) {
+                reply(WrapError(output.error()));
+                return;
+              }
+              EncodableList wrapped;
+              auto output_optional = std::move(output).TakeValue();
+              if (output_optional) {
+                wrapped.push_back(
+                    CustomEncodableValue(std::move(output_optional).value()));
+              } else {
+                wrapped.push_back(EncodableValue());
+              }
+              reply(EncodableValue(std::move(wrapped)));
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "echoAnotherNullableEnum" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_another_enum_arg = args.at(0);
               AnotherEnum another_enum_arg_value;
               const AnotherEnum* another_enum_arg = nullptr;
               if (!encodable_another_enum_arg.IsNull()) {
@@ -5939,6 +6505,84 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
       channel.SetMessageHandler(nullptr);
     }
   }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNonNullEnumList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_list_arg = args.at(0);
+              if (encodable_enum_list_arg.IsNull()) {
+                reply(WrapError("enum_list_arg unexpectedly null."));
+                return;
+              }
+              const auto& enum_list_arg =
+                  std::get<EncodableList>(encodable_enum_list_arg);
+              api->CallFlutterEchoNonNullEnumList(
+                  enum_list_arg, [reply](ErrorOr<EncodableList>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        EncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNonNullClassList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_list_arg = args.at(0);
+              if (encodable_class_list_arg.IsNull()) {
+                reply(WrapError("class_list_arg unexpectedly null."));
+                return;
+              }
+              const auto& class_list_arg =
+                  std::get<EncodableList>(encodable_class_list_arg);
+              api->CallFlutterEchoNonNullClassList(
+                  class_list_arg, [reply](ErrorOr<EncodableList>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        EncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
   {
     BasicMessageChannel<> channel(binary_messenger,
                                   "dev.flutter.pigeon.pigeon_integration_tests."
@@ -6133,33 +6777,34 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     }
   }
   {
-    BasicMessageChannel<> channel(binary_messenger,
-                                  "dev.flutter.pigeon.pigeon_integration_tests."
-                                  "HostIntegrationCoreApi.callFlutterEchoEnum" +
-                                      prepended_suffix,
-                                  &GetCodec());
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNonNullStringMap" +
+            prepended_suffix,
+        &GetCodec());
     if (api != nullptr) {
       channel.SetMessageHandler(
           [api](const EncodableValue& message,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_an_enum_arg = args.at(0);
-              if (encodable_an_enum_arg.IsNull()) {
-                reply(WrapError("an_enum_arg unexpectedly null."));
+              const auto& encodable_string_map_arg = args.at(0);
+              if (encodable_string_map_arg.IsNull()) {
+                reply(WrapError("string_map_arg unexpectedly null."));
                 return;
               }
-              const auto& an_enum_arg = std::any_cast<const AnEnum&>(
-                  std::get<CustomEncodableValue>(encodable_an_enum_arg));
-              api->CallFlutterEchoEnum(
-                  an_enum_arg, [reply](ErrorOr<AnEnum>&& output) {
+              const auto& string_map_arg =
+                  std::get<EncodableMap>(encodable_string_map_arg);
+              api->CallFlutterEchoNonNullStringMap(
+                  string_map_arg, [reply](ErrorOr<EncodableMap>&& output) {
                     if (output.has_error()) {
                       reply(WrapError(output.error()));
                       return;
                     }
                     EncodableList wrapped;
                     wrapped.push_back(
-                        CustomEncodableValue(std::move(output).TakeValue()));
+                        EncodableValue(std::move(output).TakeValue()));
                     reply(EncodableValue(std::move(wrapped)));
                   });
             } catch (const std::exception& exception) {
@@ -6174,7 +6819,162 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoAnotherEnum" +
+        "callFlutterEchoNonNullIntMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_int_map_arg = args.at(0);
+              if (encodable_int_map_arg.IsNull()) {
+                reply(WrapError("int_map_arg unexpectedly null."));
+                return;
+              }
+              const auto& int_map_arg =
+                  std::get<EncodableMap>(encodable_int_map_arg);
+              api->CallFlutterEchoNonNullIntMap(
+                  int_map_arg, [reply](ErrorOr<EncodableMap>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        EncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNonNullEnumMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_map_arg = args.at(0);
+              if (encodable_enum_map_arg.IsNull()) {
+                reply(WrapError("enum_map_arg unexpectedly null."));
+                return;
+              }
+              const auto& enum_map_arg =
+                  std::get<EncodableMap>(encodable_enum_map_arg);
+              api->CallFlutterEchoNonNullEnumMap(
+                  enum_map_arg, [reply](ErrorOr<EncodableMap>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        EncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNonNullClassMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_map_arg = args.at(0);
+              if (encodable_class_map_arg.IsNull()) {
+                reply(WrapError("class_map_arg unexpectedly null."));
+                return;
+              }
+              const auto& class_map_arg =
+                  std::get<EncodableMap>(encodable_class_map_arg);
+              api->CallFlutterEchoNonNullClassMap(
+                  class_map_arg, [reply](ErrorOr<EncodableMap>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        EncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(binary_messenger,
+                                  "dev.flutter.pigeon.pigeon_integration_tests."
+                                  "HostIntegrationCoreApi.callFlutterEchoEnum" +
+                                      prepended_suffix,
+                                  &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_an_enum_arg = args.at(0);
+              if (encodable_an_enum_arg.IsNull()) {
+                reply(WrapError("an_enum_arg unexpectedly null."));
+                return;
+              }
+              const auto& an_enum_arg = std::any_cast<const AnEnum&>(
+                  std::get<CustomEncodableValue>(encodable_an_enum_arg));
+              api->CallFlutterEchoEnum(
+                  an_enum_arg, [reply](ErrorOr<AnEnum>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    wrapped.push_back(
+                        CustomEncodableValue(std::move(output).TakeValue()));
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoAnotherEnum" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6508,12 +7308,258 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_class_list_arg = args.at(0);
-              const auto* class_list_arg =
-                  std::get_if<EncodableList>(&encodable_class_list_arg);
-              api->CallFlutterEchoNullableClassList(
-                  class_list_arg,
-                  [reply](ErrorOr<std::optional<EncodableList>>&& output) {
+              const auto& encodable_class_list_arg = args.at(0);
+              const auto* class_list_arg =
+                  std::get_if<EncodableList>(&encodable_class_list_arg);
+              api->CallFlutterEchoNullableClassList(
+                  class_list_arg,
+                  [reply](ErrorOr<std::optional<EncodableList>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableNonNullEnumList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_list_arg = args.at(0);
+              const auto* enum_list_arg =
+                  std::get_if<EncodableList>(&encodable_enum_list_arg);
+              api->CallFlutterEchoNullableNonNullEnumList(
+                  enum_list_arg,
+                  [reply](ErrorOr<std::optional<EncodableList>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableNonNullClassList" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_class_list_arg = args.at(0);
+              const auto* class_list_arg =
+                  std::get_if<EncodableList>(&encodable_class_list_arg);
+              api->CallFlutterEchoNullableNonNullClassList(
+                  class_list_arg,
+                  [reply](ErrorOr<std::optional<EncodableList>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_map_arg = args.at(0);
+              const auto* map_arg =
+                  std::get_if<EncodableMap>(&encodable_map_arg);
+              api->CallFlutterEchoNullableMap(
+                  map_arg,
+                  [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableStringMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_string_map_arg = args.at(0);
+              const auto* string_map_arg =
+                  std::get_if<EncodableMap>(&encodable_string_map_arg);
+              api->CallFlutterEchoNullableStringMap(
+                  string_map_arg,
+                  [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableIntMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_int_map_arg = args.at(0);
+              const auto* int_map_arg =
+                  std::get_if<EncodableMap>(&encodable_int_map_arg);
+              api->CallFlutterEchoNullableIntMap(
+                  int_map_arg,
+                  [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
+                    if (output.has_error()) {
+                      reply(WrapError(output.error()));
+                      return;
+                    }
+                    EncodableList wrapped;
+                    auto output_optional = std::move(output).TakeValue();
+                    if (output_optional) {
+                      wrapped.push_back(
+                          EncodableValue(std::move(output_optional).value()));
+                    } else {
+                      wrapped.push_back(EncodableValue());
+                    }
+                    reply(EncodableValue(std::move(wrapped)));
+                  });
+            } catch (const std::exception& exception) {
+              reply(WrapError(exception.what()));
+            }
+          });
+    } else {
+      channel.SetMessageHandler(nullptr);
+    }
+  }
+  {
+    BasicMessageChannel<> channel(
+        binary_messenger,
+        "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
+        "callFlutterEchoNullableEnumMap" +
+            prepended_suffix,
+        &GetCodec());
+    if (api != nullptr) {
+      channel.SetMessageHandler(
+          [api](const EncodableValue& message,
+                const flutter::MessageReply<EncodableValue>& reply) {
+            try {
+              const auto& args = std::get<EncodableList>(message);
+              const auto& encodable_enum_map_arg = args.at(0);
+              const auto* enum_map_arg =
+                  std::get_if<EncodableMap>(&encodable_enum_map_arg);
+              api->CallFlutterEchoNullableEnumMap(
+                  enum_map_arg,
+                  [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
                       reply(WrapError(output.error()));
                       return;
@@ -6540,7 +7586,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoNullableMap" +
+        "callFlutterEchoNullableClassMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6549,11 +7595,11 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
                 const flutter::MessageReply<EncodableValue>& reply) {
             try {
               const auto& args = std::get<EncodableList>(message);
-              const auto& encodable_map_arg = args.at(0);
-              const auto* map_arg =
-                  std::get_if<EncodableMap>(&encodable_map_arg);
-              api->CallFlutterEchoNullableMap(
-                  map_arg,
+              const auto& encodable_class_map_arg = args.at(0);
+              const auto* class_map_arg =
+                  std::get_if<EncodableMap>(&encodable_class_map_arg);
+              api->CallFlutterEchoNullableClassMap(
+                  class_map_arg,
                   [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
                       reply(WrapError(output.error()));
@@ -6581,7 +7627,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoNullableStringMap" +
+        "callFlutterEchoNullableNonNullStringMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6593,7 +7639,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& encodable_string_map_arg = args.at(0);
               const auto* string_map_arg =
                   std::get_if<EncodableMap>(&encodable_string_map_arg);
-              api->CallFlutterEchoNullableStringMap(
+              api->CallFlutterEchoNullableNonNullStringMap(
                   string_map_arg,
                   [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
@@ -6622,7 +7668,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoNullableIntMap" +
+        "callFlutterEchoNullableNonNullIntMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6634,7 +7680,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& encodable_int_map_arg = args.at(0);
               const auto* int_map_arg =
                   std::get_if<EncodableMap>(&encodable_int_map_arg);
-              api->CallFlutterEchoNullableIntMap(
+              api->CallFlutterEchoNullableNonNullIntMap(
                   int_map_arg,
                   [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
@@ -6663,7 +7709,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoNullableEnumMap" +
+        "callFlutterEchoNullableNonNullEnumMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6675,7 +7721,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& encodable_enum_map_arg = args.at(0);
               const auto* enum_map_arg =
                   std::get_if<EncodableMap>(&encodable_enum_map_arg);
-              api->CallFlutterEchoNullableEnumMap(
+              api->CallFlutterEchoNullableNonNullEnumMap(
                   enum_map_arg,
                   [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
@@ -6704,7 +7750,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
     BasicMessageChannel<> channel(
         binary_messenger,
         "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi."
-        "callFlutterEchoNullableClassMap" +
+        "callFlutterEchoNullableNonNullClassMap" +
             prepended_suffix,
         &GetCodec());
     if (api != nullptr) {
@@ -6716,7 +7762,7 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& encodable_class_map_arg = args.at(0);
               const auto* class_map_arg =
                   std::get_if<EncodableMap>(&encodable_class_map_arg);
-              api->CallFlutterEchoNullableClassMap(
+              api->CallFlutterEchoNullableNonNullClassMap(
                   class_map_arg,
                   [reply](ErrorOr<std::optional<EncodableMap>>&& output) {
                     if (output.has_error()) {
@@ -7439,17 +8485,245 @@ void FlutterIntegrationCoreApi::EchoList(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoEnumList(
-    const EncodableList& enum_list_arg,
-    std::function<void(const EncodableList&)>&& on_success,
+void FlutterIntegrationCoreApi::EchoEnumList(
+    const EncodableList& enum_list_arg,
+    std::function<void(const EncodableList&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoEnumList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(enum_list_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableList>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoClassList(
+    const EncodableList& class_list_arg,
+    std::function<void(const EncodableList&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoClassList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(class_list_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableList>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNonNullEnumList(
+    const EncodableList& enum_list_arg,
+    std::function<void(const EncodableList&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNonNullEnumList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(enum_list_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableList>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNonNullClassList(
+    const EncodableList& class_list_arg,
+    std::function<void(const EncodableList&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNonNullClassList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(class_list_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableList>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoMap(
+    const EncodableMap& map_arg,
+    std::function<void(const EncodableMap&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(map_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableMap>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoStringMap(
+    const EncodableMap& string_map_arg,
+    std::function<void(const EncodableMap&)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoStringMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      EncodableValue(string_map_arg),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto& return_value =
+                std::get<EncodableMap>(list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoIntMap(
+    const EncodableMap& int_map_arg,
+    std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoEnumList" +
+      "echoIntMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
-      EncodableValue(enum_list_arg),
+      EncodableValue(int_map_arg),
   });
   channel.Send(
       encoded_api_arguments, [channel_name, on_success = std::move(on_success),
@@ -7468,7 +8742,7 @@ void FlutterIntegrationCoreApi::EchoEnumList(
                              list_return_value->at(2)));
           } else {
             const auto& return_value =
-                std::get<EncodableList>(list_return_value->at(0));
+                std::get<EncodableMap>(list_return_value->at(0));
             on_success(return_value);
           }
         } else {
@@ -7477,17 +8751,17 @@ void FlutterIntegrationCoreApi::EchoEnumList(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoClassList(
-    const EncodableList& class_list_arg,
-    std::function<void(const EncodableList&)>&& on_success,
+void FlutterIntegrationCoreApi::EchoEnumMap(
+    const EncodableMap& enum_map_arg,
+    std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoClassList" +
+      "echoEnumMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
-      EncodableValue(class_list_arg),
+      EncodableValue(enum_map_arg),
   });
   channel.Send(
       encoded_api_arguments, [channel_name, on_success = std::move(on_success),
@@ -7506,7 +8780,7 @@ void FlutterIntegrationCoreApi::EchoClassList(
                              list_return_value->at(2)));
           } else {
             const auto& return_value =
-                std::get<EncodableList>(list_return_value->at(0));
+                std::get<EncodableMap>(list_return_value->at(0));
             on_success(return_value);
           }
         } else {
@@ -7515,17 +8789,17 @@ void FlutterIntegrationCoreApi::EchoClassList(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoMap(
-    const EncodableMap& map_arg,
+void FlutterIntegrationCoreApi::EchoClassMap(
+    const EncodableMap& class_map_arg,
     std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoMap" +
+      "echoClassMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
-      EncodableValue(map_arg),
+      EncodableValue(class_map_arg),
   });
   channel.Send(
       encoded_api_arguments, [channel_name, on_success = std::move(on_success),
@@ -7553,13 +8827,13 @@ void FlutterIntegrationCoreApi::EchoMap(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoStringMap(
+void FlutterIntegrationCoreApi::EchoNonNullStringMap(
     const EncodableMap& string_map_arg,
     std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoStringMap" +
+      "echoNonNullStringMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
@@ -7591,13 +8865,13 @@ void FlutterIntegrationCoreApi::EchoStringMap(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoIntMap(
+void FlutterIntegrationCoreApi::EchoNonNullIntMap(
     const EncodableMap& int_map_arg,
     std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoIntMap" +
+      "echoNonNullIntMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
@@ -7629,13 +8903,13 @@ void FlutterIntegrationCoreApi::EchoIntMap(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoEnumMap(
+void FlutterIntegrationCoreApi::EchoNonNullEnumMap(
     const EncodableMap& enum_map_arg,
     std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoEnumMap" +
+      "echoNonNullEnumMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
@@ -7667,13 +8941,13 @@ void FlutterIntegrationCoreApi::EchoEnumMap(
       });
 }
 
-void FlutterIntegrationCoreApi::EchoClassMap(
+void FlutterIntegrationCoreApi::EchoNonNullClassMap(
     const EncodableMap& class_map_arg,
     std::function<void(const EncodableMap&)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
   const std::string channel_name =
       "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
-      "echoClassMap" +
+      "echoNonNullClassMap" +
       message_channel_suffix_;
   BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
   EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
@@ -8080,6 +9354,82 @@ void FlutterIntegrationCoreApi::EchoNullableClassList(
       });
 }
 
+void FlutterIntegrationCoreApi::EchoNullableNonNullEnumList(
+    const EncodableList* enum_list_arg,
+    std::function<void(const EncodableList*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullEnumList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      enum_list_arg ? EncodableValue(*enum_list_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableList>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNullableNonNullClassList(
+    const EncodableList* class_list_arg,
+    std::function<void(const EncodableList*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullClassList" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      class_list_arg ? EncodableValue(*class_list_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableList>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
 void FlutterIntegrationCoreApi::EchoNullableMap(
     const EncodableMap* map_arg,
     std::function<void(const EncodableMap*)>&& on_success,
@@ -8270,6 +9620,158 @@ void FlutterIntegrationCoreApi::EchoNullableClassMap(
       });
 }
 
+void FlutterIntegrationCoreApi::EchoNullableNonNullStringMap(
+    const EncodableMap* string_map_arg,
+    std::function<void(const EncodableMap*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullStringMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      string_map_arg ? EncodableValue(*string_map_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableMap>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNullableNonNullIntMap(
+    const EncodableMap* int_map_arg,
+    std::function<void(const EncodableMap*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullIntMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      int_map_arg ? EncodableValue(*int_map_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableMap>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNullableNonNullEnumMap(
+    const EncodableMap* enum_map_arg,
+    std::function<void(const EncodableMap*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullEnumMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      enum_map_arg ? EncodableValue(*enum_map_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableMap>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
+void FlutterIntegrationCoreApi::EchoNullableNonNullClassMap(
+    const EncodableMap* class_map_arg,
+    std::function<void(const EncodableMap*)>&& on_success,
+    std::function<void(const FlutterError&)>&& on_error) {
+  const std::string channel_name =
+      "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi."
+      "echoNullableNonNullClassMap" +
+      message_channel_suffix_;
+  BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec());
+  EncodableValue encoded_api_arguments = EncodableValue(EncodableList{
+      class_map_arg ? EncodableValue(*class_map_arg) : EncodableValue(),
+  });
+  channel.Send(
+      encoded_api_arguments, [channel_name, on_success = std::move(on_success),
+                              on_error = std::move(on_error)](
+                                 const uint8_t* reply, size_t reply_size) {
+        std::unique_ptr<EncodableValue> response =
+            GetCodec().DecodeMessage(reply, reply_size);
+        const auto& encodable_return_value = *response;
+        const auto* list_return_value =
+            std::get_if<EncodableList>(&encodable_return_value);
+        if (list_return_value) {
+          if (list_return_value->size() > 1) {
+            on_error(
+                FlutterError(std::get<std::string>(list_return_value->at(0)),
+                             std::get<std::string>(list_return_value->at(1)),
+                             list_return_value->at(2)));
+          } else {
+            const auto* return_value =
+                std::get_if<EncodableMap>(&list_return_value->at(0));
+            on_success(return_value);
+          }
+        } else {
+          on_error(CreateConnectionError(channel_name));
+        }
+      });
+}
+
 void FlutterIntegrationCoreApi::EchoNullableEnum(
     const AnEnum* an_enum_arg, std::function<void(const AnEnum*)>&& on_success,
     std::function<void(const FlutterError&)>&& on_error) {
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
index d2539af2f35..a73e01e439a 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
+++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
@@ -121,11 +121,13 @@ class AllTypes {
                     const flutter::EncodableList& double_list,
                     const flutter::EncodableList& bool_list,
                     const flutter::EncodableList& enum_list,
+                    const flutter::EncodableList& object_list,
                     const flutter::EncodableList& list_list,
                     const flutter::EncodableMap& map,
                     const flutter::EncodableMap& string_map,
                     const flutter::EncodableMap& int_map,
-                    const flutter::EncodableMap& enum_map);
+                    const flutter::EncodableMap& enum_map,
+                    const flutter::EncodableMap& object_map);
 
   bool a_bool() const;
   void set_a_bool(bool value_arg);
@@ -181,6 +183,9 @@ class AllTypes {
   const flutter::EncodableList& enum_list() const;
   void set_enum_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList& object_list() const;
+  void set_object_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableList& list_list() const;
   void set_list_list(const flutter::EncodableList& value_arg);
 
@@ -196,6 +201,9 @@ class AllTypes {
   const flutter::EncodableMap& enum_map() const;
   void set_enum_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap& object_map() const;
+  void set_object_map(const flutter::EncodableMap& value_arg);
+
  private:
   static AllTypes FromEncodableList(const flutter::EncodableList& list);
   flutter::EncodableList ToEncodableList() const;
@@ -225,11 +233,13 @@ class AllTypes {
   flutter::EncodableList double_list_;
   flutter::EncodableList bool_list_;
   flutter::EncodableList enum_list_;
+  flutter::EncodableList object_list_;
   flutter::EncodableList list_list_;
   flutter::EncodableMap map_;
   flutter::EncodableMap string_map_;
   flutter::EncodableMap int_map_;
   flutter::EncodableMap enum_map_;
+  flutter::EncodableMap object_map_;
 };
 
 // A class containing all supported nullable types.
@@ -258,11 +268,13 @@ class AllNullableTypes {
       const flutter::EncodableList* double_list,
       const flutter::EncodableList* bool_list,
       const flutter::EncodableList* enum_list,
+      const flutter::EncodableList* object_list,
       const flutter::EncodableList* list_list,
       const flutter::EncodableList* recursive_class_list,
       const flutter::EncodableMap* map, const flutter::EncodableMap* string_map,
       const flutter::EncodableMap* int_map,
       const flutter::EncodableMap* enum_map,
+      const flutter::EncodableMap* object_map,
       const flutter::EncodableMap* recursive_class_map);
 
   ~AllNullableTypes() = default;
@@ -346,6 +358,10 @@ class AllNullableTypes {
   void set_enum_list(const flutter::EncodableList* value_arg);
   void set_enum_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList* object_list() const;
+  void set_object_list(const flutter::EncodableList* value_arg);
+  void set_object_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableList* list_list() const;
   void set_list_list(const flutter::EncodableList* value_arg);
   void set_list_list(const flutter::EncodableList& value_arg);
@@ -370,6 +386,10 @@ class AllNullableTypes {
   void set_enum_map(const flutter::EncodableMap* value_arg);
   void set_enum_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap* object_map() const;
+  void set_object_map(const flutter::EncodableMap* value_arg);
+  void set_object_map(const flutter::EncodableMap& value_arg);
+
   const flutter::EncodableMap* recursive_class_map() const;
   void set_recursive_class_map(const flutter::EncodableMap* value_arg);
   void set_recursive_class_map(const flutter::EncodableMap& value_arg);
@@ -404,12 +424,14 @@ class AllNullableTypes {
   std::optional<flutter::EncodableList> double_list_;
   std::optional<flutter::EncodableList> bool_list_;
   std::optional<flutter::EncodableList> enum_list_;
+  std::optional<flutter::EncodableList> object_list_;
   std::optional<flutter::EncodableList> list_list_;
   std::optional<flutter::EncodableList> recursive_class_list_;
   std::optional<flutter::EncodableMap> map_;
   std::optional<flutter::EncodableMap> string_map_;
   std::optional<flutter::EncodableMap> int_map_;
   std::optional<flutter::EncodableMap> enum_map_;
+  std::optional<flutter::EncodableMap> object_map_;
   std::optional<flutter::EncodableMap> recursive_class_map_;
 };
 
@@ -440,10 +462,12 @@ class AllNullableTypesWithoutRecursion {
       const flutter::EncodableList* double_list,
       const flutter::EncodableList* bool_list,
       const flutter::EncodableList* enum_list,
+      const flutter::EncodableList* object_list,
       const flutter::EncodableList* list_list, const flutter::EncodableMap* map,
       const flutter::EncodableMap* string_map,
       const flutter::EncodableMap* int_map,
-      const flutter::EncodableMap* enum_map);
+      const flutter::EncodableMap* enum_map,
+      const flutter::EncodableMap* object_map);
 
   const bool* a_nullable_bool() const;
   void set_a_nullable_bool(const bool* value_arg);
@@ -517,6 +541,10 @@ class AllNullableTypesWithoutRecursion {
   void set_enum_list(const flutter::EncodableList* value_arg);
   void set_enum_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList* object_list() const;
+  void set_object_list(const flutter::EncodableList* value_arg);
+  void set_object_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableList* list_list() const;
   void set_list_list(const flutter::EncodableList* value_arg);
   void set_list_list(const flutter::EncodableList& value_arg);
@@ -537,6 +565,10 @@ class AllNullableTypesWithoutRecursion {
   void set_enum_map(const flutter::EncodableMap* value_arg);
   void set_enum_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap* object_map() const;
+  void set_object_map(const flutter::EncodableMap* value_arg);
+  void set_object_map(const flutter::EncodableMap& value_arg);
+
  private:
   static AllNullableTypesWithoutRecursion FromEncodableList(
       const flutter::EncodableList& list);
@@ -567,11 +599,13 @@ class AllNullableTypesWithoutRecursion {
   std::optional<flutter::EncodableList> double_list_;
   std::optional<flutter::EncodableList> bool_list_;
   std::optional<flutter::EncodableList> enum_list_;
+  std::optional<flutter::EncodableList> object_list_;
   std::optional<flutter::EncodableList> list_list_;
   std::optional<flutter::EncodableMap> map_;
   std::optional<flutter::EncodableMap> string_map_;
   std::optional<flutter::EncodableMap> int_map_;
   std::optional<flutter::EncodableMap> enum_map_;
+  std::optional<flutter::EncodableMap> object_map_;
 };
 
 // A class for testing nested class handling.
@@ -741,6 +775,12 @@ class HostIntegrationCoreApi {
   // Returns the passed list, to test serialization and deserialization.
   virtual ErrorOr<flutter::EncodableList> EchoClassList(
       const flutter::EncodableList& class_list) = 0;
+  // Returns the passed list, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableList> EchoNonNullEnumList(
+      const flutter::EncodableList& enum_list) = 0;
+  // Returns the passed list, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableList> EchoNonNullClassList(
+      const flutter::EncodableList& class_list) = 0;
   // Returns the passed map, to test serialization and deserialization.
   virtual ErrorOr<flutter::EncodableMap> EchoMap(
       const flutter::EncodableMap& map) = 0;
@@ -756,6 +796,18 @@ class HostIntegrationCoreApi {
   // Returns the passed map, to test serialization and deserialization.
   virtual ErrorOr<flutter::EncodableMap> EchoClassMap(
       const flutter::EncodableMap& class_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableMap> EchoNonNullStringMap(
+      const flutter::EncodableMap& string_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableMap> EchoNonNullIntMap(
+      const flutter::EncodableMap& int_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableMap> EchoNonNullEnumMap(
+      const flutter::EncodableMap& enum_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<flutter::EncodableMap> EchoNonNullClassMap(
+      const flutter::EncodableMap& class_map) = 0;
   // Returns the passed class to test nested class serialization and
   // deserialization.
   virtual ErrorOr<AllClassesWrapper> EchoClassWrapper(
@@ -823,6 +875,12 @@ class HostIntegrationCoreApi {
   // Returns the passed list, to test serialization and deserialization.
   virtual ErrorOr<std::optional<flutter::EncodableList>> EchoNullableClassList(
       const flutter::EncodableList* class_list) = 0;
+  // Returns the passed list, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableList>>
+  EchoNullableNonNullEnumList(const flutter::EncodableList* enum_list) = 0;
+  // Returns the passed list, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableList>>
+  EchoNullableNonNullClassList(const flutter::EncodableList* class_list) = 0;
   // Returns the passed map, to test serialization and deserialization.
   virtual ErrorOr<std::optional<flutter::EncodableMap>> EchoNullableMap(
       const flutter::EncodableMap* map) = 0;
@@ -838,6 +896,18 @@ class HostIntegrationCoreApi {
   // Returns the passed map, to test serialization and deserialization.
   virtual ErrorOr<std::optional<flutter::EncodableMap>> EchoNullableClassMap(
       const flutter::EncodableMap* class_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullStringMap(const flutter::EncodableMap* string_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullIntMap(const flutter::EncodableMap* int_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullEnumMap(const flutter::EncodableMap* enum_map) = 0;
+  // Returns the passed map, to test serialization and deserialization.
+  virtual ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullClassMap(const flutter::EncodableMap* class_map) = 0;
   virtual ErrorOr<std::optional<AnEnum>> EchoNullableEnum(
       const AnEnum* an_enum) = 0;
   virtual ErrorOr<std::optional<AnotherEnum>> EchoAnotherNullableEnum(
@@ -1084,6 +1154,12 @@ class HostIntegrationCoreApi {
   virtual void CallFlutterEchoClassList(
       const flutter::EncodableList& class_list,
       std::function<void(ErrorOr<flutter::EncodableList> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullEnumList(
+      const flutter::EncodableList& enum_list,
+      std::function<void(ErrorOr<flutter::EncodableList> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullClassList(
+      const flutter::EncodableList& class_list,
+      std::function<void(ErrorOr<flutter::EncodableList> reply)> result) = 0;
   virtual void CallFlutterEchoMap(
       const flutter::EncodableMap& map,
       std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
@@ -1099,6 +1175,18 @@ class HostIntegrationCoreApi {
   virtual void CallFlutterEchoClassMap(
       const flutter::EncodableMap& class_map,
       std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullStringMap(
+      const flutter::EncodableMap& string_map,
+      std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullIntMap(
+      const flutter::EncodableMap& int_map,
+      std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullEnumMap(
+      const flutter::EncodableMap& enum_map,
+      std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
+  virtual void CallFlutterEchoNonNullClassMap(
+      const flutter::EncodableMap& class_map,
+      std::function<void(ErrorOr<flutter::EncodableMap> reply)> result) = 0;
   virtual void CallFlutterEchoEnum(
       const AnEnum& an_enum,
       std::function<void(ErrorOr<AnEnum> reply)> result) = 0;
@@ -1134,6 +1222,14 @@ class HostIntegrationCoreApi {
       const flutter::EncodableList* class_list,
       std::function<void(ErrorOr<std::optional<flutter::EncodableList>> reply)>
           result) = 0;
+  virtual void CallFlutterEchoNullableNonNullEnumList(
+      const flutter::EncodableList* enum_list,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableList>> reply)>
+          result) = 0;
+  virtual void CallFlutterEchoNullableNonNullClassList(
+      const flutter::EncodableList* class_list,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableList>> reply)>
+          result) = 0;
   virtual void CallFlutterEchoNullableMap(
       const flutter::EncodableMap* map,
       std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
@@ -1154,6 +1250,22 @@ class HostIntegrationCoreApi {
       const flutter::EncodableMap* class_map,
       std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
           result) = 0;
+  virtual void CallFlutterEchoNullableNonNullStringMap(
+      const flutter::EncodableMap* string_map,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
+          result) = 0;
+  virtual void CallFlutterEchoNullableNonNullIntMap(
+      const flutter::EncodableMap* int_map,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
+          result) = 0;
+  virtual void CallFlutterEchoNullableNonNullEnumMap(
+      const flutter::EncodableMap* enum_map,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
+          result) = 0;
+  virtual void CallFlutterEchoNullableNonNullClassMap(
+      const flutter::EncodableMap* class_map,
+      std::function<void(ErrorOr<std::optional<flutter::EncodableMap>> reply)>
+          result) = 0;
   virtual void CallFlutterEchoNullableEnum(
       const AnEnum* an_enum,
       std::function<void(ErrorOr<std::optional<AnEnum>> reply)> result) = 0;
@@ -1264,6 +1376,16 @@ class FlutterIntegrationCoreApi {
       const flutter::EncodableList& class_list,
       std::function<void(const flutter::EncodableList&)>&& on_success,
       std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed list, to test serialization and deserialization.
+  void EchoNonNullEnumList(
+      const flutter::EncodableList& enum_list,
+      std::function<void(const flutter::EncodableList&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed list, to test serialization and deserialization.
+  void EchoNonNullClassList(
+      const flutter::EncodableList& class_list,
+      std::function<void(const flutter::EncodableList&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
   // Returns the passed map, to test serialization and deserialization.
   void EchoMap(const flutter::EncodableMap& map,
                std::function<void(const flutter::EncodableMap&)>&& on_success,
@@ -1288,6 +1410,26 @@ class FlutterIntegrationCoreApi {
       const flutter::EncodableMap& class_map,
       std::function<void(const flutter::EncodableMap&)>&& on_success,
       std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNonNullStringMap(
+      const flutter::EncodableMap& string_map,
+      std::function<void(const flutter::EncodableMap&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNonNullIntMap(
+      const flutter::EncodableMap& int_map,
+      std::function<void(const flutter::EncodableMap&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNonNullEnumMap(
+      const flutter::EncodableMap& enum_map,
+      std::function<void(const flutter::EncodableMap&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNonNullClassMap(
+      const flutter::EncodableMap& class_map,
+      std::function<void(const flutter::EncodableMap&)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
   // Returns the passed enum to test serialization and deserialization.
   void EchoEnum(const AnEnum& an_enum,
                 std::function<void(const AnEnum&)>&& on_success,
@@ -1332,6 +1474,16 @@ class FlutterIntegrationCoreApi {
       const flutter::EncodableList* class_list,
       std::function<void(const flutter::EncodableList*)>&& on_success,
       std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed list, to test serialization and deserialization.
+  void EchoNullableNonNullEnumList(
+      const flutter::EncodableList* enum_list,
+      std::function<void(const flutter::EncodableList*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed list, to test serialization and deserialization.
+  void EchoNullableNonNullClassList(
+      const flutter::EncodableList* class_list,
+      std::function<void(const flutter::EncodableList*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
   // Returns the passed map, to test serialization and deserialization.
   void EchoNullableMap(
       const flutter::EncodableMap* map,
@@ -1357,6 +1509,26 @@ class FlutterIntegrationCoreApi {
       const flutter::EncodableMap* class_map,
       std::function<void(const flutter::EncodableMap*)>&& on_success,
       std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNullableNonNullStringMap(
+      const flutter::EncodableMap* string_map,
+      std::function<void(const flutter::EncodableMap*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNullableNonNullIntMap(
+      const flutter::EncodableMap* int_map,
+      std::function<void(const flutter::EncodableMap*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNullableNonNullEnumMap(
+      const flutter::EncodableMap* enum_map,
+      std::function<void(const flutter::EncodableMap*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
+  // Returns the passed map, to test serialization and deserialization.
+  void EchoNullableNonNullClassMap(
+      const flutter::EncodableMap* class_map,
+      std::function<void(const flutter::EncodableMap*)>&& on_success,
+      std::function<void(const FlutterError&)>&& on_error);
   // Returns the passed enum to test serialization and deserialization.
   void EchoNullableEnum(const AnEnum* an_enum,
                         std::function<void(const AnEnum*)>&& on_success,
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp
index b3d040a6ee3..c6f69c0a8c0 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp
+++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp
@@ -151,6 +151,16 @@ ErrorOr<EncodableList> TestPlugin::EchoClassList(
   return class_list;
 }
 
+ErrorOr<EncodableList> TestPlugin::EchoNonNullEnumList(
+    const EncodableList& enum_list) {
+  return enum_list;
+}
+
+ErrorOr<EncodableList> TestPlugin::EchoNonNullClassList(
+    const EncodableList& class_list) {
+  return class_list;
+}
+
 ErrorOr<EncodableMap> TestPlugin::EchoMap(const EncodableMap& a_map) {
   return a_map;
 }
@@ -172,6 +182,26 @@ ErrorOr<EncodableMap> TestPlugin::EchoClassMap(const EncodableMap& class_map) {
   return class_map;
 }
 
+ErrorOr<EncodableMap> TestPlugin::EchoNonNullStringMap(
+    const EncodableMap& string_map) {
+  return string_map;
+}
+
+ErrorOr<EncodableMap> TestPlugin::EchoNonNullIntMap(
+    const EncodableMap& int_map) {
+  return int_map;
+}
+
+ErrorOr<EncodableMap> TestPlugin::EchoNonNullEnumMap(
+    const EncodableMap& enum_map) {
+  return enum_map;
+}
+
+ErrorOr<EncodableMap> TestPlugin::EchoNonNullClassMap(
+    const EncodableMap& class_map) {
+  return class_map;
+}
+
 ErrorOr<AllClassesWrapper> TestPlugin::EchoClassWrapper(
     const AllClassesWrapper& wrapper) {
   return wrapper;
@@ -327,6 +357,22 @@ ErrorOr<std::optional<EncodableList>> TestPlugin::EchoNullableClassList(
   return *class_list;
 };
 
+ErrorOr<std::optional<EncodableList>> TestPlugin::EchoNullableNonNullEnumList(
+    const EncodableList* enum_list) {
+  if (!enum_list) {
+    return std::nullopt;
+  }
+  return *enum_list;
+};
+
+ErrorOr<std::optional<EncodableList>> TestPlugin::EchoNullableNonNullClassList(
+    const EncodableList* class_list) {
+  if (!class_list) {
+    return std::nullopt;
+  }
+  return *class_list;
+};
+
 ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableMap(
     const EncodableMap* map) {
   if (!map) {
@@ -367,6 +413,38 @@ ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableClassMap(
   return *class_map;
 };
 
+ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableNonNullStringMap(
+    const EncodableMap* string_map) {
+  if (!string_map) {
+    return std::nullopt;
+  }
+  return *string_map;
+};
+
+ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableNonNullIntMap(
+    const EncodableMap* int_map) {
+  if (!int_map) {
+    return std::nullopt;
+  }
+  return *int_map;
+};
+
+ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableNonNullEnumMap(
+    const EncodableMap* enum_map) {
+  if (!enum_map) {
+    return std::nullopt;
+  }
+  return *enum_map;
+};
+
+ErrorOr<std::optional<EncodableMap>> TestPlugin::EchoNullableNonNullClassMap(
+    const EncodableMap* class_map) {
+  if (!class_map) {
+    return std::nullopt;
+  }
+  return *class_map;
+};
+
 ErrorOr<std::optional<AnEnum>> TestPlugin::EchoNullableEnum(
     const AnEnum* an_enum) {
   if (!an_enum) {
@@ -772,6 +850,22 @@ void TestPlugin::CallFlutterEchoClassList(
       [result](const FlutterError& error) { result(error); });
 }
 
+void TestPlugin::CallFlutterEchoNonNullEnumList(
+    const EncodableList& enum_list,
+    std::function<void(ErrorOr<EncodableList> reply)> result) {
+  flutter_api_->EchoNonNullEnumList(
+      enum_list, [result](const EncodableList& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNonNullClassList(
+    const EncodableList& class_list,
+    std::function<void(ErrorOr<EncodableList> reply)> result) {
+  flutter_api_->EchoNonNullClassList(
+      class_list, [result](const EncodableList& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
 void TestPlugin::CallFlutterEchoMap(
     const EncodableMap& map,
     std::function<void(ErrorOr<EncodableMap> reply)> result) {
@@ -812,6 +906,38 @@ void TestPlugin::CallFlutterEchoClassMap(
       [result](const FlutterError& error) { result(error); });
 }
 
+void TestPlugin::CallFlutterEchoNonNullStringMap(
+    const EncodableMap& string_map,
+    std::function<void(ErrorOr<EncodableMap> reply)> result) {
+  flutter_api_->EchoNonNullStringMap(
+      string_map, [result](const EncodableMap& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNonNullIntMap(
+    const EncodableMap& int_map,
+    std::function<void(ErrorOr<EncodableMap> reply)> result) {
+  flutter_api_->EchoNonNullIntMap(
+      int_map, [result](const EncodableMap& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNonNullEnumMap(
+    const EncodableMap& enum_map,
+    std::function<void(ErrorOr<EncodableMap> reply)> result) {
+  flutter_api_->EchoNonNullEnumMap(
+      enum_map, [result](const EncodableMap& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNonNullClassMap(
+    const EncodableMap& class_map,
+    std::function<void(ErrorOr<EncodableMap> reply)> result) {
+  flutter_api_->EchoNonNullClassMap(
+      class_map, [result](const EncodableMap& echo) { result(echo); },
+      [result](const FlutterError& error) { result(error); });
+}
+
 void TestPlugin::CallFlutterEchoEnum(
     const AnEnum& an_enum, std::function<void(ErrorOr<AnEnum> reply)> result) {
   flutter_api_->EchoEnum(
@@ -917,6 +1043,28 @@ void TestPlugin::CallFlutterEchoNullableClassList(
       [result](const FlutterError& error) { result(error); });
 }
 
+void TestPlugin::CallFlutterEchoNullableNonNullEnumList(
+    const EncodableList* enum_list,
+    std::function<void(ErrorOr<std::optional<EncodableList>> reply)> result) {
+  flutter_api_->EchoNullableNonNullEnumList(
+      enum_list,
+      [result](const EncodableList* echo) {
+        result(echo ? std::optional<EncodableList>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNullableNonNullClassList(
+    const EncodableList* class_list,
+    std::function<void(ErrorOr<std::optional<EncodableList>> reply)> result) {
+  flutter_api_->EchoNullableNonNullClassList(
+      class_list,
+      [result](const EncodableList* echo) {
+        result(echo ? std::optional<EncodableList>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
 void TestPlugin::CallFlutterEchoNullableMap(
     const EncodableMap* map,
     std::function<void(ErrorOr<std::optional<EncodableMap>> reply)> result) {
@@ -972,6 +1120,50 @@ void TestPlugin::CallFlutterEchoNullableClassMap(
       [result](const FlutterError& error) { result(error); });
 }
 
+void TestPlugin::CallFlutterEchoNullableNonNullStringMap(
+    const EncodableMap* string_map,
+    std::function<void(ErrorOr<std::optional<EncodableMap>> reply)> result) {
+  flutter_api_->EchoNullableNonNullStringMap(
+      string_map,
+      [result](const EncodableMap* echo) {
+        result(echo ? std::optional<EncodableMap>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNullableNonNullIntMap(
+    const EncodableMap* int_map,
+    std::function<void(ErrorOr<std::optional<EncodableMap>> reply)> result) {
+  flutter_api_->EchoNullableNonNullIntMap(
+      int_map,
+      [result](const EncodableMap* echo) {
+        result(echo ? std::optional<EncodableMap>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNullableNonNullEnumMap(
+    const EncodableMap* enum_map,
+    std::function<void(ErrorOr<std::optional<EncodableMap>> reply)> result) {
+  flutter_api_->EchoNullableNonNullEnumMap(
+      enum_map,
+      [result](const EncodableMap* echo) {
+        result(echo ? std::optional<EncodableMap>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
+void TestPlugin::CallFlutterEchoNullableNonNullClassMap(
+    const EncodableMap* class_map,
+    std::function<void(ErrorOr<std::optional<EncodableMap>> reply)> result) {
+  flutter_api_->EchoNullableNonNullClassMap(
+      class_map,
+      [result](const EncodableMap* echo) {
+        result(echo ? std::optional<EncodableMap>(*echo) : std::nullopt);
+      },
+      [result](const FlutterError& error) { result(error); });
+}
+
 void TestPlugin::CallFlutterEchoNullableEnum(
     const AnEnum* an_enum,
     std::function<void(ErrorOr<std::optional<AnEnum>> reply)> result) {
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h
index 706659b6c35..cabbe665ed5 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h
+++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h
@@ -85,6 +85,10 @@ class TestPlugin : public flutter::Plugin,
       const flutter::EncodableList& enum_list) override;
   core_tests_pigeontest::ErrorOr<flutter::EncodableList> EchoClassList(
       const flutter::EncodableList& class_list) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableList> EchoNonNullEnumList(
+      const flutter::EncodableList& enum_list) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableList> EchoNonNullClassList(
+      const flutter::EncodableList& class_list) override;
   core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoMap(
       const flutter::EncodableMap& map) override;
   core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoStringMap(
@@ -95,6 +99,14 @@ class TestPlugin : public flutter::Plugin,
       const flutter::EncodableMap& enum_map) override;
   core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoClassMap(
       const flutter::EncodableMap& class_map) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoNonNullStringMap(
+      const flutter::EncodableMap& string_map) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoNonNullIntMap(
+      const flutter::EncodableMap& int_map) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoNonNullEnumMap(
+      const flutter::EncodableMap& enum_map) override;
+  core_tests_pigeontest::ErrorOr<flutter::EncodableMap> EchoNonNullClassMap(
+      const flutter::EncodableMap& class_map) override;
   core_tests_pigeontest::ErrorOr<core_tests_pigeontest::AllClassesWrapper>
   EchoClassWrapper(
       const core_tests_pigeontest::AllClassesWrapper& wrapper) override;
@@ -142,6 +154,11 @@ class TestPlugin : public flutter::Plugin,
   EchoNullableEnumList(const flutter::EncodableList* enum_list) override;
   core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
   EchoNullableClassList(const flutter::EncodableList* class_list) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
+  EchoNullableNonNullEnumList(const flutter::EncodableList* enum_list) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
+  EchoNullableNonNullClassList(
+      const flutter::EncodableList* class_list) override;
   core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
   EchoNullableMap(const flutter::EncodableMap* map) override;
   core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
@@ -152,6 +169,15 @@ class TestPlugin : public flutter::Plugin,
   EchoNullableEnumMap(const flutter::EncodableMap* enum_map) override;
   core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
   EchoNullableClassMap(const flutter::EncodableMap* class_map) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullStringMap(
+      const flutter::EncodableMap* string_map) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullIntMap(const flutter::EncodableMap* int_map) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullEnumMap(const flutter::EncodableMap* enum_map) override;
+  core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+  EchoNullableNonNullClassMap(const flutter::EncodableMap* class_map) override;
   core_tests_pigeontest::ErrorOr<std::optional<core_tests_pigeontest::AnEnum>>
   EchoNullableEnum(const core_tests_pigeontest::AnEnum* an_enum) override;
   core_tests_pigeontest::ErrorOr<
@@ -450,6 +476,16 @@ class TestPlugin : public flutter::Plugin,
       std::function<
           void(core_tests_pigeontest::ErrorOr<flutter::EncodableList> reply)>
           result) override;
+  void CallFlutterEchoNonNullEnumList(
+      const flutter::EncodableList& enum_list,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableList> reply)>
+          result) override;
+  void CallFlutterEchoNonNullClassList(
+      const flutter::EncodableList& class_list,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableList> reply)>
+          result) override;
   void CallFlutterEchoMap(
       const flutter::EncodableMap& map,
       std::function<
@@ -475,6 +511,26 @@ class TestPlugin : public flutter::Plugin,
       std::function<
           void(core_tests_pigeontest::ErrorOr<flutter::EncodableMap> reply)>
           result) override;
+  void CallFlutterEchoNonNullStringMap(
+      const flutter::EncodableMap& string_map,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableMap> reply)>
+          result) override;
+  void CallFlutterEchoNonNullIntMap(
+      const flutter::EncodableMap& int_map,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableMap> reply)>
+          result) override;
+  void CallFlutterEchoNonNullEnumMap(
+      const flutter::EncodableMap& enum_map,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableMap> reply)>
+          result) override;
+  void CallFlutterEchoNonNullClassMap(
+      const flutter::EncodableMap& class_map,
+      std::function<
+          void(core_tests_pigeontest::ErrorOr<flutter::EncodableMap> reply)>
+          result) override;
   void CallFlutterEchoEnum(
       const core_tests_pigeontest::AnEnum& an_enum,
       std::function<void(
@@ -530,6 +586,18 @@ class TestPlugin : public flutter::Plugin,
           core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
               reply)>
           result) override;
+  void CallFlutterEchoNullableNonNullEnumList(
+      const flutter::EncodableList* enum_list,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
+              reply)>
+          result) override;
+  void CallFlutterEchoNullableNonNullClassList(
+      const flutter::EncodableList* class_list,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableList>>
+              reply)>
+          result) override;
   void CallFlutterEchoNullableMap(
       const flutter::EncodableMap* map,
       std::function<void(
@@ -560,6 +628,30 @@ class TestPlugin : public flutter::Plugin,
           core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
               reply)>
           result) override;
+  void CallFlutterEchoNullableNonNullStringMap(
+      const flutter::EncodableMap* string_map,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+              reply)>
+          result) override;
+  void CallFlutterEchoNullableNonNullIntMap(
+      const flutter::EncodableMap* int_map,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+              reply)>
+          result) override;
+  void CallFlutterEchoNullableNonNullEnumMap(
+      const flutter::EncodableMap* enum_map,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+              reply)>
+          result) override;
+  void CallFlutterEchoNullableNonNullClassMap(
+      const flutter::EncodableMap* class_map,
+      std::function<void(
+          core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableMap>>
+              reply)>
+          result) override;
   void CallFlutterEchoNullableEnum(
       const core_tests_pigeontest::AnEnum* an_enum,
       std::function<void(core_tests_pigeontest::ErrorOr<
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index e0c17074182..c2e58e40761 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 22.3.0 # This must match the version in lib/generator_tools.dart
+version: 22.4.0 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ^3.3.0
diff --git a/packages/pigeon/test/pigeon_lib_test.dart b/packages/pigeon/test/pigeon_lib_test.dart
index b29f71e03d9..9e3fa213fc7 100644
--- a/packages/pigeon/test/pigeon_lib_test.dart
+++ b/packages/pigeon/test/pigeon_lib_test.dart
@@ -744,25 +744,6 @@ abstract class Api {
     expect(field.type.typeArguments[0].typeArguments[0].baseName, 'int');
   });
 
-  test('error nonnull type argument', () {
-    const String code = '''
-class Foo {
-  List<int> list;
-}
-
-@HostApi()
-abstract class Api {
-  void doit(Foo foo);
-}
-''';
-    final ParseResults parseResult = parseSource(code);
-    expect(parseResult.errors.length, equals(1));
-    expect(parseResult.errors[0].message,
-        contains('Generic type parameters must be nullable'));
-    expect(parseResult.errors[0].message, contains('"list"'));
-    expect(parseResult.errors[0].lineNumber, 2);
-  });
-
   test('enums argument host', () {
     const String code = '''
 enum Foo {

From f05d7b58cf8471f5514644cb390649325cb2ed1a Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Mon, 9 Sep 2024 16:21:45 -0700
Subject: [PATCH 2/8] wrapped tests

---
 packages/pigeon/pigeons/core_tests.dart       |  36 +--
 .../CoreTests.java                            | 273 ++++++++++++++++--
 .../AllDatatypesTest.java                     |  10 +
 .../ios/RunnerTests/AllDatatypesTest.m        |   8 +
 .../ios/Classes/CoreTests.gen.h               |  72 +++--
 .../ios/Classes/CoreTests.gen.m               | 124 +++++---
 .../macos/Classes/CoreTests.gen.h             |  72 +++--
 .../macos/Classes/CoreTests.gen.m             | 124 +++++---
 .../lib/src/generated/core_tests.gen.dart     |  85 ++++--
 .../lib/test_types.dart                       |  18 +-
 .../com/example/test_plugin/CoreTests.gen.kt  |  78 +++--
 .../example/test_plugin/AllDatatypesTest.kt   |   8 +-
 .../ios/RunnerTests/AllDatatypesTests.swift   |  20 +-
 .../ios/Classes/CoreTests.gen.swift           |  80 +++--
 .../linux/pigeon/core_tests.gen.cc            | 260 ++++++++++++++---
 .../test_plugin/linux/pigeon/core_tests.gen.h | 128 +++++++-
 .../macos/Classes/CoreTests.gen.swift         |  80 +++--
 .../windows/pigeon/core_tests.gen.cpp         | 219 ++++++++++++--
 .../windows/pigeon/core_tests.gen.h           |  57 +++-
 19 files changed, 1403 insertions(+), 349 deletions(-)

diff --git a/packages/pigeon/pigeons/core_tests.dart b/packages/pigeon/pigeons/core_tests.dart
index 9d4232be8ef..0bdfd40cd1f 100644
--- a/packages/pigeon/pigeons/core_tests.dart
+++ b/packages/pigeon/pigeons/core_tests.dart
@@ -52,7 +52,7 @@ class AllTypes {
     required this.enumList,
     required this.objectList,
     required this.listList,
-    // required this.mapList,
+    required this.mapList,
 
     // Maps
     required this.map,
@@ -62,8 +62,8 @@ class AllTypes {
     // required this.boolMap,
     required this.enumMap,
     required this.objectMap,
-    // required this.listMap,
-    // required this.mapMap,
+    required this.listMap,
+    required this.mapMap,
   });
 
   bool aBool;
@@ -89,7 +89,7 @@ class AllTypes {
   List<AnEnum> enumList;
   List<Object> objectList;
   List<List<Object?>> listList;
-  // List<Map<Object?, Object?>> mapList;
+  List<Map<Object?, Object?>> mapList;
 
   // Maps
   // ignore: strict_raw_type, always_specify_types
@@ -100,8 +100,8 @@ class AllTypes {
   // Map<int, bool> boolMap;
   Map<AnEnum, AnEnum> enumMap;
   Map<Object, Object> objectMap;
-  // Map<int, List<Object?>> listMap;
-  // Map<int, Map<Object?, Object?>> mapMap;
+  Map<int, List<Object?>> listMap;
+  Map<int, Map<Object?, Object?>> mapMap;
 }
 
 /// A class containing all supported nullable types.
@@ -133,7 +133,7 @@ class AllNullableTypes {
     this.enumList,
     this.objectList,
     this.listList,
-    // this.mapList,
+    this.mapList,
     this.recursiveClassList,
 
     // Maps
@@ -144,8 +144,8 @@ class AllNullableTypes {
     // this.boolMap,
     this.enumMap,
     this.objectMap,
-    // this.listMap,
-    // this.mapMap,
+    this.listMap,
+    this.mapMap,
     this.recursiveClassMap,
   );
 
@@ -173,7 +173,7 @@ class AllNullableTypes {
   List<AnEnum?>? enumList;
   List<Object?>? objectList;
   List<List<Object?>?>? listList;
-  // List<Map<Object?, Object?>?>? mapList;
+  List<Map<Object?, Object?>?>? mapList;
   List<AllNullableTypes?>? recursiveClassList;
 
   // Maps
@@ -185,8 +185,8 @@ class AllNullableTypes {
   // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
   Map<Object?, Object?>? objectMap;
-  // Map<int, List<Object?>?>? listMap;
-  // Map<int, Map<Object?, Object?>?>? mapMap;
+  Map<int?, List<Object?>?>? listMap;
+  Map<int?, Map<Object?, Object?>?>? mapMap;
   Map<int?, AllNullableTypes?>? recursiveClassMap;
 }
 
@@ -219,7 +219,7 @@ class AllNullableTypesWithoutRecursion {
     this.enumList,
     this.objectList,
     this.listList,
-    // this.mapList,
+    this.mapList,
 
     // Maps
     this.map,
@@ -229,8 +229,8 @@ class AllNullableTypesWithoutRecursion {
     // this.boolMap,
     this.enumMap,
     this.objectMap,
-    // this.listMap,
-    // this.mapMap,
+    this.listMap,
+    this.mapMap,
   );
 
   bool? aNullableBool;
@@ -256,7 +256,7 @@ class AllNullableTypesWithoutRecursion {
   List<AnEnum?>? enumList;
   List<Object?>? objectList;
   List<List<Object?>?>? listList;
-  // List<Map<Object?, Object?>?>? mapList;
+  List<Map<Object?, Object?>?>? mapList;
 
   // Maps
   // ignore: strict_raw_type, always_specify_types
@@ -267,8 +267,8 @@ class AllNullableTypesWithoutRecursion {
   // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
   Map<Object?, Object?>? objectMap;
-  // Map<int, List<Object?>?>? listMap;
-  // Map<int, Map<String, String?>?>? mapMap;
+  Map<int?, List<Object?>?>? listMap;
+  Map<int?, Map<Object?, Object?>?>? mapMap;
 }
 
 /// A class for testing nested class handling.
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
index bd306279ee7..4707969aab1 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
@@ -426,6 +426,19 @@ public void setListList(@NonNull List<List<Object>> setterArg) {
       this.listList = setterArg;
     }
 
+    private @NonNull List<Map<Object, Object>> mapList;
+
+    public @NonNull List<Map<Object, Object>> getMapList() {
+      return mapList;
+    }
+
+    public void setMapList(@NonNull List<Map<Object, Object>> setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"mapList\" is null.");
+      }
+      this.mapList = setterArg;
+    }
+
     private @NonNull Map<Object, Object> map;
 
     public @NonNull Map<Object, Object> getMap() {
@@ -491,6 +504,32 @@ public void setObjectMap(@NonNull Map<Object, Object> setterArg) {
       this.objectMap = setterArg;
     }
 
+    private @NonNull Map<Long, List<Object>> listMap;
+
+    public @NonNull Map<Long, List<Object>> getListMap() {
+      return listMap;
+    }
+
+    public void setListMap(@NonNull Map<Long, List<Object>> setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"listMap\" is null.");
+      }
+      this.listMap = setterArg;
+    }
+
+    private @NonNull Map<Long, Map<Object, Object>> mapMap;
+
+    public @NonNull Map<Long, Map<Object, Object>> getMapMap() {
+      return mapMap;
+    }
+
+    public void setMapMap(@NonNull Map<Long, Map<Object, Object>> setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"mapMap\" is null.");
+      }
+      this.mapMap = setterArg;
+    }
+
     /** Constructor is non-public to enforce null safety; use Builder. */
     AllTypes() {}
 
@@ -523,11 +562,14 @@ public boolean equals(Object o) {
           && enumList.equals(that.enumList)
           && objectList.equals(that.objectList)
           && listList.equals(that.listList)
+          && mapList.equals(that.mapList)
           && map.equals(that.map)
           && stringMap.equals(that.stringMap)
           && intMap.equals(that.intMap)
           && enumMap.equals(that.enumMap)
-          && objectMap.equals(that.objectMap);
+          && objectMap.equals(that.objectMap)
+          && listMap.equals(that.listMap)
+          && mapMap.equals(that.mapMap);
     }
 
     @Override
@@ -550,11 +592,14 @@ public int hashCode() {
               enumList,
               objectList,
               listList,
+              mapList,
               map,
               stringMap,
               intMap,
               enumMap,
-              objectMap);
+              objectMap,
+              listMap,
+              mapMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(a4ByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(a8ByteArray);
@@ -724,6 +769,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Map<Object, Object>> mapList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapList(@NonNull List<Map<Object, Object>> setterArg) {
+        this.mapList = setterArg;
+        return this;
+      }
+
       private @Nullable Map<Object, Object> map;
 
       @CanIgnoreReturnValue
@@ -764,6 +817,22 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Long, List<Object>> listMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setListMap(@NonNull Map<Long, List<Object>> setterArg) {
+        this.listMap = setterArg;
+        return this;
+      }
+
+      private @Nullable Map<Long, Map<Object, Object>> mapMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapMap(@NonNull Map<Long, Map<Object, Object>> setterArg) {
+        this.mapMap = setterArg;
+        return this;
+      }
+
       public @NonNull AllTypes build() {
         AllTypes pigeonReturn = new AllTypes();
         pigeonReturn.setABool(aBool);
@@ -786,18 +855,21 @@ public static final class Builder {
         pigeonReturn.setEnumList(enumList);
         pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
+        pigeonReturn.setMapList(mapList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
         pigeonReturn.setObjectMap(objectMap);
+        pigeonReturn.setListMap(listMap);
+        pigeonReturn.setMapMap(mapMap);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(25);
+      ArrayList<Object> toListResult = new ArrayList<>(28);
       toListResult.add(aBool);
       toListResult.add(anInt);
       toListResult.add(anInt64);
@@ -818,11 +890,14 @@ ArrayList<Object> toList() {
       toListResult.add(enumList);
       toListResult.add(objectList);
       toListResult.add(listList);
+      toListResult.add(mapList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
       toListResult.add(objectMap);
+      toListResult.add(listMap);
+      toListResult.add(mapMap);
       return toListResult;
     }
 
@@ -868,16 +943,22 @@ ArrayList<Object> toList() {
       pigeonResult.setObjectList((List<Object>) objectList);
       Object listList = pigeonVar_list.get(19);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object map = pigeonVar_list.get(20);
+      Object mapList = pigeonVar_list.get(20);
+      pigeonResult.setMapList((List<Map<Object, Object>>) mapList);
+      Object map = pigeonVar_list.get(21);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(21);
+      Object stringMap = pigeonVar_list.get(22);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(22);
+      Object intMap = pigeonVar_list.get(23);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(23);
+      Object enumMap = pigeonVar_list.get(24);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
-      Object objectMap = pigeonVar_list.get(24);
+      Object objectMap = pigeonVar_list.get(25);
       pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
+      Object listMap = pigeonVar_list.get(26);
+      pigeonResult.setListMap((Map<Long, List<Object>>) listMap);
+      Object mapMap = pigeonVar_list.get(27);
+      pigeonResult.setMapMap((Map<Long, Map<Object, Object>>) mapMap);
       return pigeonResult;
     }
   }
@@ -1098,6 +1179,16 @@ public void setListList(@Nullable List<List<Object>> setterArg) {
       this.listList = setterArg;
     }
 
+    private @Nullable List<Map<Object, Object>> mapList;
+
+    public @Nullable List<Map<Object, Object>> getMapList() {
+      return mapList;
+    }
+
+    public void setMapList(@Nullable List<Map<Object, Object>> setterArg) {
+      this.mapList = setterArg;
+    }
+
     private @Nullable List<AllNullableTypes> recursiveClassList;
 
     public @Nullable List<AllNullableTypes> getRecursiveClassList() {
@@ -1158,6 +1249,26 @@ public void setObjectMap(@Nullable Map<Object, Object> setterArg) {
       this.objectMap = setterArg;
     }
 
+    private @Nullable Map<Long, List<Object>> listMap;
+
+    public @Nullable Map<Long, List<Object>> getListMap() {
+      return listMap;
+    }
+
+    public void setListMap(@Nullable Map<Long, List<Object>> setterArg) {
+      this.listMap = setterArg;
+    }
+
+    private @Nullable Map<Long, Map<Object, Object>> mapMap;
+
+    public @Nullable Map<Long, Map<Object, Object>> getMapMap() {
+      return mapMap;
+    }
+
+    public void setMapMap(@Nullable Map<Long, Map<Object, Object>> setterArg) {
+      this.mapMap = setterArg;
+    }
+
     private @Nullable Map<Long, AllNullableTypes> recursiveClassMap;
 
     public @Nullable Map<Long, AllNullableTypes> getRecursiveClassMap() {
@@ -1198,12 +1309,15 @@ public boolean equals(Object o) {
           && Objects.equals(enumList, that.enumList)
           && Objects.equals(objectList, that.objectList)
           && Objects.equals(listList, that.listList)
+          && Objects.equals(mapList, that.mapList)
           && Objects.equals(recursiveClassList, that.recursiveClassList)
           && Objects.equals(map, that.map)
           && Objects.equals(stringMap, that.stringMap)
           && Objects.equals(intMap, that.intMap)
           && Objects.equals(enumMap, that.enumMap)
           && Objects.equals(objectMap, that.objectMap)
+          && Objects.equals(listMap, that.listMap)
+          && Objects.equals(mapMap, that.mapMap)
           && Objects.equals(recursiveClassMap, that.recursiveClassMap);
     }
 
@@ -1228,12 +1342,15 @@ public int hashCode() {
               enumList,
               objectList,
               listList,
+              mapList,
               recursiveClassList,
               map,
               stringMap,
               intMap,
               enumMap,
               objectMap,
+              listMap,
+              mapMap,
               recursiveClassMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullableByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable4ByteArray);
@@ -1412,6 +1529,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Map<Object, Object>> mapList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapList(@Nullable List<Map<Object, Object>> setterArg) {
+        this.mapList = setterArg;
+        return this;
+      }
+
       private @Nullable List<AllNullableTypes> recursiveClassList;
 
       @CanIgnoreReturnValue
@@ -1460,6 +1585,22 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Long, List<Object>> listMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setListMap(@Nullable Map<Long, List<Object>> setterArg) {
+        this.listMap = setterArg;
+        return this;
+      }
+
+      private @Nullable Map<Long, Map<Object, Object>> mapMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapMap(@Nullable Map<Long, Map<Object, Object>> setterArg) {
+        this.mapMap = setterArg;
+        return this;
+      }
+
       private @Nullable Map<Long, AllNullableTypes> recursiveClassMap;
 
       @CanIgnoreReturnValue
@@ -1492,12 +1633,15 @@ public static final class Builder {
         pigeonReturn.setEnumList(enumList);
         pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
+        pigeonReturn.setMapList(mapList);
         pigeonReturn.setRecursiveClassList(recursiveClassList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
         pigeonReturn.setObjectMap(objectMap);
+        pigeonReturn.setListMap(listMap);
+        pigeonReturn.setMapMap(mapMap);
         pigeonReturn.setRecursiveClassMap(recursiveClassMap);
         return pigeonReturn;
       }
@@ -1505,7 +1649,7 @@ public static final class Builder {
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(28);
+      ArrayList<Object> toListResult = new ArrayList<>(31);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
       toListResult.add(aNullableInt64);
@@ -1527,12 +1671,15 @@ ArrayList<Object> toList() {
       toListResult.add(enumList);
       toListResult.add(objectList);
       toListResult.add(listList);
+      toListResult.add(mapList);
       toListResult.add(recursiveClassList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
       toListResult.add(objectMap);
+      toListResult.add(listMap);
+      toListResult.add(mapMap);
       toListResult.add(recursiveClassMap);
       return toListResult;
     }
@@ -1581,19 +1728,25 @@ ArrayList<Object> toList() {
       pigeonResult.setObjectList((List<Object>) objectList);
       Object listList = pigeonVar_list.get(20);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object recursiveClassList = pigeonVar_list.get(21);
+      Object mapList = pigeonVar_list.get(21);
+      pigeonResult.setMapList((List<Map<Object, Object>>) mapList);
+      Object recursiveClassList = pigeonVar_list.get(22);
       pigeonResult.setRecursiveClassList((List<AllNullableTypes>) recursiveClassList);
-      Object map = pigeonVar_list.get(22);
+      Object map = pigeonVar_list.get(23);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(23);
+      Object stringMap = pigeonVar_list.get(24);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(24);
+      Object intMap = pigeonVar_list.get(25);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(25);
+      Object enumMap = pigeonVar_list.get(26);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
-      Object objectMap = pigeonVar_list.get(26);
+      Object objectMap = pigeonVar_list.get(27);
       pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
-      Object recursiveClassMap = pigeonVar_list.get(27);
+      Object listMap = pigeonVar_list.get(28);
+      pigeonResult.setListMap((Map<Long, List<Object>>) listMap);
+      Object mapMap = pigeonVar_list.get(29);
+      pigeonResult.setMapMap((Map<Long, Map<Object, Object>>) mapMap);
+      Object recursiveClassMap = pigeonVar_list.get(30);
       pigeonResult.setRecursiveClassMap((Map<Long, AllNullableTypes>) recursiveClassMap);
       return pigeonResult;
     }
@@ -1806,6 +1959,16 @@ public void setListList(@Nullable List<List<Object>> setterArg) {
       this.listList = setterArg;
     }
 
+    private @Nullable List<Map<Object, Object>> mapList;
+
+    public @Nullable List<Map<Object, Object>> getMapList() {
+      return mapList;
+    }
+
+    public void setMapList(@Nullable List<Map<Object, Object>> setterArg) {
+      this.mapList = setterArg;
+    }
+
     private @Nullable Map<Object, Object> map;
 
     public @Nullable Map<Object, Object> getMap() {
@@ -1856,6 +2019,26 @@ public void setObjectMap(@Nullable Map<Object, Object> setterArg) {
       this.objectMap = setterArg;
     }
 
+    private @Nullable Map<Long, List<Object>> listMap;
+
+    public @Nullable Map<Long, List<Object>> getListMap() {
+      return listMap;
+    }
+
+    public void setListMap(@Nullable Map<Long, List<Object>> setterArg) {
+      this.listMap = setterArg;
+    }
+
+    private @Nullable Map<Long, Map<Object, Object>> mapMap;
+
+    public @Nullable Map<Long, Map<Object, Object>> getMapMap() {
+      return mapMap;
+    }
+
+    public void setMapMap(@Nullable Map<Long, Map<Object, Object>> setterArg) {
+      this.mapMap = setterArg;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -1885,11 +2068,14 @@ public boolean equals(Object o) {
           && Objects.equals(enumList, that.enumList)
           && Objects.equals(objectList, that.objectList)
           && Objects.equals(listList, that.listList)
+          && Objects.equals(mapList, that.mapList)
           && Objects.equals(map, that.map)
           && Objects.equals(stringMap, that.stringMap)
           && Objects.equals(intMap, that.intMap)
           && Objects.equals(enumMap, that.enumMap)
-          && Objects.equals(objectMap, that.objectMap);
+          && Objects.equals(objectMap, that.objectMap)
+          && Objects.equals(listMap, that.listMap)
+          && Objects.equals(mapMap, that.mapMap);
     }
 
     @Override
@@ -1912,11 +2098,14 @@ public int hashCode() {
               enumList,
               objectList,
               listList,
+              mapList,
               map,
               stringMap,
               intMap,
               enumMap,
-              objectMap);
+              objectMap,
+              listMap,
+              mapMap);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullableByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable4ByteArray);
       pigeonVar_result = 31 * pigeonVar_result + Arrays.hashCode(aNullable8ByteArray);
@@ -2086,6 +2275,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable List<Map<Object, Object>> mapList;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapList(@Nullable List<Map<Object, Object>> setterArg) {
+        this.mapList = setterArg;
+        return this;
+      }
+
       private @Nullable Map<Object, Object> map;
 
       @CanIgnoreReturnValue
@@ -2126,6 +2323,22 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Map<Long, List<Object>> listMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setListMap(@Nullable Map<Long, List<Object>> setterArg) {
+        this.listMap = setterArg;
+        return this;
+      }
+
+      private @Nullable Map<Long, Map<Object, Object>> mapMap;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMapMap(@Nullable Map<Long, Map<Object, Object>> setterArg) {
+        this.mapMap = setterArg;
+        return this;
+      }
+
       public @NonNull AllNullableTypesWithoutRecursion build() {
         AllNullableTypesWithoutRecursion pigeonReturn = new AllNullableTypesWithoutRecursion();
         pigeonReturn.setANullableBool(aNullableBool);
@@ -2148,18 +2361,21 @@ public static final class Builder {
         pigeonReturn.setEnumList(enumList);
         pigeonReturn.setObjectList(objectList);
         pigeonReturn.setListList(listList);
+        pigeonReturn.setMapList(mapList);
         pigeonReturn.setMap(map);
         pigeonReturn.setStringMap(stringMap);
         pigeonReturn.setIntMap(intMap);
         pigeonReturn.setEnumMap(enumMap);
         pigeonReturn.setObjectMap(objectMap);
+        pigeonReturn.setListMap(listMap);
+        pigeonReturn.setMapMap(mapMap);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(25);
+      ArrayList<Object> toListResult = new ArrayList<>(28);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
       toListResult.add(aNullableInt64);
@@ -2180,11 +2396,14 @@ ArrayList<Object> toList() {
       toListResult.add(enumList);
       toListResult.add(objectList);
       toListResult.add(listList);
+      toListResult.add(mapList);
       toListResult.add(map);
       toListResult.add(stringMap);
       toListResult.add(intMap);
       toListResult.add(enumMap);
       toListResult.add(objectMap);
+      toListResult.add(listMap);
+      toListResult.add(mapMap);
       return toListResult;
     }
 
@@ -2231,16 +2450,22 @@ ArrayList<Object> toList() {
       pigeonResult.setObjectList((List<Object>) objectList);
       Object listList = pigeonVar_list.get(19);
       pigeonResult.setListList((List<List<Object>>) listList);
-      Object map = pigeonVar_list.get(20);
+      Object mapList = pigeonVar_list.get(20);
+      pigeonResult.setMapList((List<Map<Object, Object>>) mapList);
+      Object map = pigeonVar_list.get(21);
       pigeonResult.setMap((Map<Object, Object>) map);
-      Object stringMap = pigeonVar_list.get(21);
+      Object stringMap = pigeonVar_list.get(22);
       pigeonResult.setStringMap((Map<String, String>) stringMap);
-      Object intMap = pigeonVar_list.get(22);
+      Object intMap = pigeonVar_list.get(23);
       pigeonResult.setIntMap((Map<Long, Long>) intMap);
-      Object enumMap = pigeonVar_list.get(23);
+      Object enumMap = pigeonVar_list.get(24);
       pigeonResult.setEnumMap((Map<AnEnum, AnEnum>) enumMap);
-      Object objectMap = pigeonVar_list.get(24);
+      Object objectMap = pigeonVar_list.get(25);
       pigeonResult.setObjectMap((Map<Object, Object>) objectMap);
+      Object listMap = pigeonVar_list.get(26);
+      pigeonResult.setListMap((Map<Long, List<Object>>) listMap);
+      Object mapMap = pigeonVar_list.get(27);
+      pigeonResult.setMapMap((Map<Long, Map<Object, Object>>) mapMap);
       return pigeonResult;
     }
   }
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
index 2d95c14dc64..d873a0ffe42 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java
@@ -16,6 +16,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 
 public class AllDatatypesTest {
@@ -170,7 +171,13 @@ public void hasValues() {
     // Not inline due to warnings about an ambiguous varargs call when inline.
     final List<Object> genericList = Arrays.asList(new Object[] {"hello", 1, true, false, null});
     final List<List<Object>> listList = new ArrayList<>(Arrays.asList());
+    final List<Map<Object, Object>> mapList = new ArrayList<>(Arrays.asList());
+    final Map<Long, List<Object>> listMap = new HashMap<Long, List<Object>>();
+    final Map<Long, Map<Object, Object>> mapMap = new HashMap<Long, Map<Object, Object>>();
     listList.add(genericList);
+    mapList.add(makeMap("hello", 1234));
+    listMap.put(1L, genericList);
+    mapMap.put(1L, makeMap("hello", 1234));
     AllTypes allEverything =
         new AllTypes.Builder()
             .setABool(false)
@@ -195,11 +202,14 @@ public void hasValues() {
                 Arrays.asList(
                     new CoreTests.AnEnum[] {CoreTests.AnEnum.ONE, CoreTests.AnEnum.FORTY_TWO}))
             .setListList(listList)
+            .setMapList(mapList)
             .setMap(makeMap("hello", 1234))
             .setIntMap(makeMap(1L, 0L))
             .setStringMap(makeMap("hello", "you"))
             .setObjectMap(makeMap("E", 4321))
             .setEnumMap(makeMap(CoreTests.AnEnum.ONE, CoreTests.AnEnum.FOUR_HUNDRED_TWENTY_TWO))
+            .setListMap(listMap)
+            .setMapMap(mapMap)
             .build();
 
     AllNullableTypes everything =
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
index 1b72e5e1c0d..b4ebec5f9c7 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/RunnerTests/AllDatatypesTest.m
@@ -67,10 +67,15 @@ - (void)testAllEquals {
   everything.stringList = @[ @"string", @"another one" ];
   everything.objectList = @[ @"string", @1 ];
   everything.listList = @[ @[ @"string" ], @[ @"another one" ] ];
+  everything.mapList = @[
+    @{@"hello" : @(1234), @"goodbye" : @"world"}, @{@"hello" : @(1234), @"goodbye" : @"world"}
+  ];
   everything.map = @{@"hello" : @(1234), @"goodbye" : @"world"};
   everything.stringMap = @{@"hello" : @"you", @"goodbye" : @"world"};
   everything.intMap = @{@(1) : @(0), @(2) : @(-2)};
   everything.objectMap = @{@"hello" : @(1234), @"goodbye" : @"world"};
+  everything.listMap = @{@(1234) : @[ @"string", @"another one" ]};
+  everything.mapMap = @{@(1234) : @{@"goodbye" : @"world"}};
   EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:FLTGetCoreTestsCodec()];
   FLTFlutterIntegrationCoreApi *api =
@@ -97,10 +102,13 @@ - (void)testAllEquals {
                    XCTAssertEqualObjects(result.stringList, everything.stringList);
                    XCTAssertEqualObjects(result.objectList, everything.objectList);
                    XCTAssertEqualObjects(result.listList, everything.listList);
+                   XCTAssertEqualObjects(result.mapList, everything.mapList);
                    XCTAssertEqualObjects(result.map, everything.map);
                    XCTAssertEqualObjects(result.stringMap, everything.stringMap);
                    XCTAssertEqualObjects(result.intMap, everything.intMap);
                    XCTAssertEqualObjects(result.objectMap, everything.objectMap);
+                   XCTAssertEqualObjects(result.listMap, everything.listMap);
+                   XCTAssertEqualObjects(result.mapMap, everything.mapMap);
                    [expectation fulfill];
                  }];
   [self waitForExpectations:@[ expectation ] timeout:1.0];
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
index 822cdf7aa57..bd913ca95a9 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
@@ -74,11 +74,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
                    objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
+                      mapList:(NSArray<NSDictionary<id, id> *> *)mapList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
                       enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                    objectMap:(NSDictionary<id, id> *)objectMap;
+                    objectMap:(NSDictionary<id, id> *)objectMap
+                      listMap:(NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                       mapMap:(NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap;
 @property(nonatomic, assign) BOOL aBool;
 @property(nonatomic, assign) NSInteger anInt;
 @property(nonatomic, assign) NSInteger anInt64;
@@ -99,11 +102,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy) NSArray<id> *objectList;
 @property(nonatomic, copy) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy) NSDictionary *map;
 @property(nonatomic, copy) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @end
 
 /// A class containing all supported nullable types.
@@ -130,12 +136,15 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
                objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
                 objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
@@ -159,12 +168,15 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy, nullable) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy, nullable) NSArray<FLTAllNullableTypes *> *recursiveClassList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @property(nonatomic, copy, nullable)
     NSDictionary<NSNumber *, FLTAllNullableTypes *> *recursiveClassMap;
 @end
@@ -173,32 +185,35 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 /// with nullable items, as the primary [AllNullableTypes] class is being used to
 /// test Swift classes.
 @interface FLTAllNullableTypesWithoutRecursion : NSObject
-+ (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
-                         aNullableInt:(nullable NSNumber *)aNullableInt
-                       aNullableInt64:(nullable NSNumber *)aNullableInt64
-                      aNullableDouble:(nullable NSNumber *)aNullableDouble
-                   aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
-                  aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
-                  aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
-                  aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
-                        aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
-                  anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString
-                      aNullableObject:(nullable id)aNullableObject
-                                 list:(nullable NSArray<id> *)list
-                           stringList:(nullable NSArray<NSString *> *)stringList
-                              intList:(nullable NSArray<NSNumber *> *)intList
-                           doubleList:(nullable NSArray<NSNumber *> *)doubleList
-                             boolList:(nullable NSArray<NSNumber *> *)boolList
-                             enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
-                           objectList:(nullable NSArray<id> *)objectList
-                             listList:(nullable NSArray<NSArray<id> *> *)listList
-                                  map:(nullable NSDictionary *)map
-                            stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
-                               intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
-                              enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                            objectMap:(nullable NSDictionary<id, id> *)objectMap;
++ (instancetype)
+    makeWithANullableBool:(nullable NSNumber *)aNullableBool
+             aNullableInt:(nullable NSNumber *)aNullableInt
+           aNullableInt64:(nullable NSNumber *)aNullableInt64
+          aNullableDouble:(nullable NSNumber *)aNullableDouble
+       aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
+      aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
+      aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
+      aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
+            aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
+      anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
+          aNullableString:(nullable NSString *)aNullableString
+          aNullableObject:(nullable id)aNullableObject
+                     list:(nullable NSArray<id> *)list
+               stringList:(nullable NSArray<NSString *> *)stringList
+                  intList:(nullable NSArray<NSNumber *> *)intList
+               doubleList:(nullable NSArray<NSNumber *> *)doubleList
+                 boolList:(nullable NSArray<NSNumber *> *)boolList
+                 enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
+                 listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
+                      map:(nullable NSDictionary *)map
+                stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                   intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                  enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -219,11 +234,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy, nullable) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @end
 
 /// A class for testing nested class handling.
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
index 3bbd52011cb..2cc3da7877d 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
@@ -138,11 +138,14 @@ + (instancetype)makeWithABool:(BOOL)aBool
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
                    objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
+                      mapList:(NSArray<NSDictionary<id, id> *> *)mapList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
                       enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                    objectMap:(NSDictionary<id, id> *)objectMap {
+                    objectMap:(NSDictionary<id, id> *)objectMap
+                      listMap:(NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                       mapMap:(NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap {
   FLTAllTypes *pigeonResult = [[FLTAllTypes alloc] init];
   pigeonResult.aBool = aBool;
   pigeonResult.anInt = anInt;
@@ -164,11 +167,14 @@ + (instancetype)makeWithABool:(BOOL)aBool
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   return pigeonResult;
 }
 + (FLTAllTypes *)fromList:(NSArray<id> *)list {
@@ -195,11 +201,14 @@ + (FLTAllTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
@@ -227,11 +236,14 @@ + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
   ];
 }
 @end
@@ -259,12 +271,15 @@ @implementation FLTAllNullableTypes
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
                objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
                 objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap {
   FLTAllNullableTypes *pigeonResult = [[FLTAllNullableTypes alloc] init];
@@ -289,12 +304,15 @@ @implementation FLTAllNullableTypes
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.recursiveClassList = recursiveClassList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   pigeonResult.recursiveClassMap = recursiveClassMap;
   return pigeonResult;
 }
@@ -321,13 +339,16 @@ + (FLTAllNullableTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 19);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 24);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 25);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 26);
-  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 27);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 27);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 28);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 29);
+  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 30);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
@@ -356,44 +377,50 @@ + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.recursiveClassList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
     self.recursiveClassMap ?: [NSNull null],
   ];
 }
 @end
 
 @implementation FLTAllNullableTypesWithoutRecursion
-+ (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
-                         aNullableInt:(nullable NSNumber *)aNullableInt
-                       aNullableInt64:(nullable NSNumber *)aNullableInt64
-                      aNullableDouble:(nullable NSNumber *)aNullableDouble
-                   aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
-                  aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
-                  aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
-                  aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
-                        aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
-                  anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString
-                      aNullableObject:(nullable id)aNullableObject
-                                 list:(nullable NSArray<id> *)list
-                           stringList:(nullable NSArray<NSString *> *)stringList
-                              intList:(nullable NSArray<NSNumber *> *)intList
-                           doubleList:(nullable NSArray<NSNumber *> *)doubleList
-                             boolList:(nullable NSArray<NSNumber *> *)boolList
-                             enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
-                           objectList:(nullable NSArray<id> *)objectList
-                             listList:(nullable NSArray<NSArray<id> *> *)listList
-                                  map:(nullable NSDictionary *)map
-                            stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
-                               intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
-                              enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                            objectMap:(nullable NSDictionary<id, id> *)objectMap {
++ (instancetype)
+    makeWithANullableBool:(nullable NSNumber *)aNullableBool
+             aNullableInt:(nullable NSNumber *)aNullableInt
+           aNullableInt64:(nullable NSNumber *)aNullableInt64
+          aNullableDouble:(nullable NSNumber *)aNullableDouble
+       aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
+      aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
+      aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
+      aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
+            aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
+      anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
+          aNullableString:(nullable NSString *)aNullableString
+          aNullableObject:(nullable id)aNullableObject
+                     list:(nullable NSArray<id> *)list
+               stringList:(nullable NSArray<NSString *> *)stringList
+                  intList:(nullable NSArray<NSNumber *> *)intList
+               doubleList:(nullable NSArray<NSNumber *> *)doubleList
+                 boolList:(nullable NSArray<NSNumber *> *)boolList
+                 enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
+                 listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
+                      map:(nullable NSDictionary *)map
+                stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                   intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                  enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap {
   FLTAllNullableTypesWithoutRecursion *pigeonResult =
       [[FLTAllNullableTypesWithoutRecursion alloc] init];
   pigeonResult.aNullableBool = aNullableBool;
@@ -416,11 +443,14 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   return pigeonResult;
 }
 + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
@@ -446,11 +476,14 @@ + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id> *)list {
@@ -478,11 +511,14 @@ + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id>
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
   ];
 }
 @end
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
index 822cdf7aa57..bd913ca95a9 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h
@@ -74,11 +74,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
                    objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
+                      mapList:(NSArray<NSDictionary<id, id> *> *)mapList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
                       enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                    objectMap:(NSDictionary<id, id> *)objectMap;
+                    objectMap:(NSDictionary<id, id> *)objectMap
+                      listMap:(NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                       mapMap:(NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap;
 @property(nonatomic, assign) BOOL aBool;
 @property(nonatomic, assign) NSInteger anInt;
 @property(nonatomic, assign) NSInteger anInt64;
@@ -99,11 +102,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy) NSArray<id> *objectList;
 @property(nonatomic, copy) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy) NSDictionary *map;
 @property(nonatomic, copy) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @end
 
 /// A class containing all supported nullable types.
@@ -130,12 +136,15 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
                objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
                 objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
@@ -159,12 +168,15 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy, nullable) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy, nullable) NSArray<FLTAllNullableTypes *> *recursiveClassList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @property(nonatomic, copy, nullable)
     NSDictionary<NSNumber *, FLTAllNullableTypes *> *recursiveClassMap;
 @end
@@ -173,32 +185,35 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 /// with nullable items, as the primary [AllNullableTypes] class is being used to
 /// test Swift classes.
 @interface FLTAllNullableTypesWithoutRecursion : NSObject
-+ (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
-                         aNullableInt:(nullable NSNumber *)aNullableInt
-                       aNullableInt64:(nullable NSNumber *)aNullableInt64
-                      aNullableDouble:(nullable NSNumber *)aNullableDouble
-                   aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
-                  aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
-                  aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
-                  aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
-                        aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
-                  anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString
-                      aNullableObject:(nullable id)aNullableObject
-                                 list:(nullable NSArray<id> *)list
-                           stringList:(nullable NSArray<NSString *> *)stringList
-                              intList:(nullable NSArray<NSNumber *> *)intList
-                           doubleList:(nullable NSArray<NSNumber *> *)doubleList
-                             boolList:(nullable NSArray<NSNumber *> *)boolList
-                             enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
-                           objectList:(nullable NSArray<id> *)objectList
-                             listList:(nullable NSArray<NSArray<id> *> *)listList
-                                  map:(nullable NSDictionary *)map
-                            stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
-                               intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
-                              enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                            objectMap:(nullable NSDictionary<id, id> *)objectMap;
++ (instancetype)
+    makeWithANullableBool:(nullable NSNumber *)aNullableBool
+             aNullableInt:(nullable NSNumber *)aNullableInt
+           aNullableInt64:(nullable NSNumber *)aNullableInt64
+          aNullableDouble:(nullable NSNumber *)aNullableDouble
+       aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
+      aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
+      aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
+      aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
+            aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
+      anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
+          aNullableString:(nullable NSString *)aNullableString
+          aNullableObject:(nullable id)aNullableObject
+                     list:(nullable NSArray<id> *)list
+               stringList:(nullable NSArray<NSString *> *)stringList
+                  intList:(nullable NSArray<NSNumber *> *)intList
+               doubleList:(nullable NSArray<NSNumber *> *)doubleList
+                 boolList:(nullable NSArray<NSNumber *> *)boolList
+                 enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
+                 listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
+                      map:(nullable NSDictionary *)map
+                stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                   intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                  enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -219,11 +234,14 @@ typedef NS_ENUM(NSUInteger, FLTAnotherEnum) {
 @property(nonatomic, copy, nullable) NSArray<FLTAnEnumBox *> *enumList;
 @property(nonatomic, copy, nullable) NSArray<id> *objectList;
 @property(nonatomic, copy, nullable) NSArray<NSArray<id> *> *listList;
+@property(nonatomic, copy, nullable) NSArray<NSDictionary<id, id> *> *mapList;
 @property(nonatomic, copy, nullable) NSDictionary *map;
 @property(nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *stringMap;
 @property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSNumber *> *intMap;
 @property(nonatomic, copy, nullable) NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *enumMap;
 @property(nonatomic, copy, nullable) NSDictionary<id, id> *objectMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSArray<id> *> *listMap;
+@property(nonatomic, copy, nullable) NSDictionary<NSNumber *, NSDictionary<id, id> *> *mapMap;
 @end
 
 /// A class for testing nested class handling.
diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
index 3bbd52011cb..2cc3da7877d 100644
--- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
+++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m
@@ -138,11 +138,14 @@ + (instancetype)makeWithABool:(BOOL)aBool
                      enumList:(NSArray<FLTAnEnumBox *> *)enumList
                    objectList:(NSArray<id> *)objectList
                      listList:(NSArray<NSArray<id> *> *)listList
+                      mapList:(NSArray<NSDictionary<id, id> *> *)mapList
                           map:(NSDictionary *)map
                     stringMap:(NSDictionary<NSString *, NSString *> *)stringMap
                        intMap:(NSDictionary<NSNumber *, NSNumber *> *)intMap
                       enumMap:(NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                    objectMap:(NSDictionary<id, id> *)objectMap {
+                    objectMap:(NSDictionary<id, id> *)objectMap
+                      listMap:(NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                       mapMap:(NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap {
   FLTAllTypes *pigeonResult = [[FLTAllTypes alloc] init];
   pigeonResult.aBool = aBool;
   pigeonResult.anInt = anInt;
@@ -164,11 +167,14 @@ + (instancetype)makeWithABool:(BOOL)aBool
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   return pigeonResult;
 }
 + (FLTAllTypes *)fromList:(NSArray<id> *)list {
@@ -195,11 +201,14 @@ + (FLTAllTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
@@ -227,11 +236,14 @@ + (nullable FLTAllTypes *)nullableFromList:(NSArray<id> *)list {
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
   ];
 }
 @end
@@ -259,12 +271,15 @@ @implementation FLTAllNullableTypes
                  enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
                objectList:(nullable NSArray<id> *)objectList
                  listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
        recursiveClassList:(nullable NSArray<FLTAllNullableTypes *> *)recursiveClassList
                       map:(nullable NSDictionary *)map
                 stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
                    intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
                   enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
                 objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap
         recursiveClassMap:
             (nullable NSDictionary<NSNumber *, FLTAllNullableTypes *> *)recursiveClassMap {
   FLTAllNullableTypes *pigeonResult = [[FLTAllNullableTypes alloc] init];
@@ -289,12 +304,15 @@ @implementation FLTAllNullableTypes
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.recursiveClassList = recursiveClassList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   pigeonResult.recursiveClassMap = recursiveClassMap;
   return pigeonResult;
 }
@@ -321,13 +339,16 @@ + (FLTAllNullableTypes *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 19);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 24);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 25);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 26);
-  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 27);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.recursiveClassList = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 27);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 28);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 29);
+  pigeonResult.recursiveClassMap = GetNullableObjectAtIndex(list, 30);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
@@ -356,44 +377,50 @@ + (nullable FLTAllNullableTypes *)nullableFromList:(NSArray<id> *)list {
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.recursiveClassList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
     self.recursiveClassMap ?: [NSNull null],
   ];
 }
 @end
 
 @implementation FLTAllNullableTypesWithoutRecursion
-+ (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
-                         aNullableInt:(nullable NSNumber *)aNullableInt
-                       aNullableInt64:(nullable NSNumber *)aNullableInt64
-                      aNullableDouble:(nullable NSNumber *)aNullableDouble
-                   aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
-                  aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
-                  aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
-                  aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
-                        aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
-                  anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString
-                      aNullableObject:(nullable id)aNullableObject
-                                 list:(nullable NSArray<id> *)list
-                           stringList:(nullable NSArray<NSString *> *)stringList
-                              intList:(nullable NSArray<NSNumber *> *)intList
-                           doubleList:(nullable NSArray<NSNumber *> *)doubleList
-                             boolList:(nullable NSArray<NSNumber *> *)boolList
-                             enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
-                           objectList:(nullable NSArray<id> *)objectList
-                             listList:(nullable NSArray<NSArray<id> *> *)listList
-                                  map:(nullable NSDictionary *)map
-                            stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
-                               intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
-                              enumMap:
-                                  (nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
-                            objectMap:(nullable NSDictionary<id, id> *)objectMap {
++ (instancetype)
+    makeWithANullableBool:(nullable NSNumber *)aNullableBool
+             aNullableInt:(nullable NSNumber *)aNullableInt
+           aNullableInt64:(nullable NSNumber *)aNullableInt64
+          aNullableDouble:(nullable NSNumber *)aNullableDouble
+       aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
+      aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
+      aNullable8ByteArray:(nullable FlutterStandardTypedData *)aNullable8ByteArray
+      aNullableFloatArray:(nullable FlutterStandardTypedData *)aNullableFloatArray
+            aNullableEnum:(nullable FLTAnEnumBox *)aNullableEnum
+      anotherNullableEnum:(nullable FLTAnotherEnumBox *)anotherNullableEnum
+          aNullableString:(nullable NSString *)aNullableString
+          aNullableObject:(nullable id)aNullableObject
+                     list:(nullable NSArray<id> *)list
+               stringList:(nullable NSArray<NSString *> *)stringList
+                  intList:(nullable NSArray<NSNumber *> *)intList
+               doubleList:(nullable NSArray<NSNumber *> *)doubleList
+                 boolList:(nullable NSArray<NSNumber *> *)boolList
+                 enumList:(nullable NSArray<FLTAnEnumBox *> *)enumList
+               objectList:(nullable NSArray<id> *)objectList
+                 listList:(nullable NSArray<NSArray<id> *> *)listList
+                  mapList:(nullable NSArray<NSDictionary<id, id> *> *)mapList
+                      map:(nullable NSDictionary *)map
+                stringMap:(nullable NSDictionary<NSString *, NSString *> *)stringMap
+                   intMap:(nullable NSDictionary<NSNumber *, NSNumber *> *)intMap
+                  enumMap:(nullable NSDictionary<FLTAnEnumBox *, FLTAnEnumBox *> *)enumMap
+                objectMap:(nullable NSDictionary<id, id> *)objectMap
+                  listMap:(nullable NSDictionary<NSNumber *, NSArray<id> *> *)listMap
+                   mapMap:(nullable NSDictionary<NSNumber *, NSDictionary<id, id> *> *)mapMap {
   FLTAllNullableTypesWithoutRecursion *pigeonResult =
       [[FLTAllNullableTypesWithoutRecursion alloc] init];
   pigeonResult.aNullableBool = aNullableBool;
@@ -416,11 +443,14 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
   pigeonResult.enumList = enumList;
   pigeonResult.objectList = objectList;
   pigeonResult.listList = listList;
+  pigeonResult.mapList = mapList;
   pigeonResult.map = map;
   pigeonResult.stringMap = stringMap;
   pigeonResult.intMap = intMap;
   pigeonResult.enumMap = enumMap;
   pigeonResult.objectMap = objectMap;
+  pigeonResult.listMap = listMap;
+  pigeonResult.mapMap = mapMap;
   return pigeonResult;
 }
 + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
@@ -446,11 +476,14 @@ + (FLTAllNullableTypesWithoutRecursion *)fromList:(NSArray<id> *)list {
   pigeonResult.enumList = GetNullableObjectAtIndex(list, 17);
   pigeonResult.objectList = GetNullableObjectAtIndex(list, 18);
   pigeonResult.listList = GetNullableObjectAtIndex(list, 19);
-  pigeonResult.map = GetNullableObjectAtIndex(list, 20);
-  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 21);
-  pigeonResult.intMap = GetNullableObjectAtIndex(list, 22);
-  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 23);
-  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.mapList = GetNullableObjectAtIndex(list, 20);
+  pigeonResult.map = GetNullableObjectAtIndex(list, 21);
+  pigeonResult.stringMap = GetNullableObjectAtIndex(list, 22);
+  pigeonResult.intMap = GetNullableObjectAtIndex(list, 23);
+  pigeonResult.enumMap = GetNullableObjectAtIndex(list, 24);
+  pigeonResult.objectMap = GetNullableObjectAtIndex(list, 25);
+  pigeonResult.listMap = GetNullableObjectAtIndex(list, 26);
+  pigeonResult.mapMap = GetNullableObjectAtIndex(list, 27);
   return pigeonResult;
 }
 + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id> *)list {
@@ -478,11 +511,14 @@ + (nullable FLTAllNullableTypesWithoutRecursion *)nullableFromList:(NSArray<id>
     self.enumList ?: [NSNull null],
     self.objectList ?: [NSNull null],
     self.listList ?: [NSNull null],
+    self.mapList ?: [NSNull null],
     self.map ?: [NSNull null],
     self.stringMap ?: [NSNull null],
     self.intMap ?: [NSNull null],
     self.enumMap ?: [NSNull null],
     self.objectMap ?: [NSNull null],
+    self.listMap ?: [NSNull null],
+    self.mapMap ?: [NSNull null],
   ];
 }
 @end
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
index c2a98def00a..234361ada5a 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
@@ -86,11 +86,14 @@ class AllTypes {
     required this.enumList,
     required this.objectList,
     required this.listList,
+    required this.mapList,
     required this.map,
     required this.stringMap,
     required this.intMap,
     required this.enumMap,
     required this.objectMap,
+    required this.listMap,
+    required this.mapMap,
   });
 
   bool aBool;
@@ -133,6 +136,8 @@ class AllTypes {
 
   List<List<Object?>> listList;
 
+  List<Map<Object?, Object?>> mapList;
+
   Map<Object?, Object?> map;
 
   Map<String, String> stringMap;
@@ -143,6 +148,10 @@ class AllTypes {
 
   Map<Object, Object> objectMap;
 
+  Map<int, List<Object?>> listMap;
+
+  Map<int, Map<Object?, Object?>> mapMap;
+
   Object encode() {
     return <Object?>[
       aBool,
@@ -165,11 +174,14 @@ class AllTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ];
   }
 
@@ -196,11 +208,16 @@ class AllTypes {
       enumList: (result[17] as List<Object?>?)!.cast<AnEnum>(),
       objectList: (result[18] as List<Object?>?)!.cast<Object>(),
       listList: (result[19] as List<Object?>?)!.cast<List<Object?>>(),
-      map: result[20]! as Map<Object?, Object?>,
-      stringMap: (result[21] as Map<Object?, Object?>?)!.cast<String, String>(),
-      intMap: (result[22] as Map<Object?, Object?>?)!.cast<int, int>(),
-      enumMap: (result[23] as Map<Object?, Object?>?)!.cast<AnEnum, AnEnum>(),
-      objectMap: (result[24] as Map<Object?, Object?>?)!.cast<Object, Object>(),
+      mapList: (result[20] as List<Object?>?)!.cast<Map<Object?, Object?>>(),
+      map: result[21]! as Map<Object?, Object?>,
+      stringMap: (result[22] as Map<Object?, Object?>?)!.cast<String, String>(),
+      intMap: (result[23] as Map<Object?, Object?>?)!.cast<int, int>(),
+      enumMap: (result[24] as Map<Object?, Object?>?)!.cast<AnEnum, AnEnum>(),
+      objectMap: (result[25] as Map<Object?, Object?>?)!.cast<Object, Object>(),
+      listMap:
+          (result[26] as Map<Object?, Object?>?)!.cast<int, List<Object?>>(),
+      mapMap: (result[27] as Map<Object?, Object?>?)!
+          .cast<int, Map<Object?, Object?>>(),
     );
   }
 }
@@ -229,12 +246,15 @@ class AllNullableTypes {
     this.enumList,
     this.objectList,
     this.listList,
+    this.mapList,
     this.recursiveClassList,
     this.map,
     this.stringMap,
     this.intMap,
     this.enumMap,
     this.objectMap,
+    this.listMap,
+    this.mapMap,
     this.recursiveClassMap,
   });
 
@@ -280,6 +300,8 @@ class AllNullableTypes {
 
   List<List<Object?>?>? listList;
 
+  List<Map<Object?, Object?>?>? mapList;
+
   List<AllNullableTypes?>? recursiveClassList;
 
   Map<Object?, Object?>? map;
@@ -292,6 +314,10 @@ class AllNullableTypes {
 
   Map<Object?, Object?>? objectMap;
 
+  Map<int?, List<Object?>?>? listMap;
+
+  Map<int?, Map<Object?, Object?>?>? mapMap;
+
   Map<int?, AllNullableTypes?>? recursiveClassMap;
 
   Object encode() {
@@ -317,12 +343,15 @@ class AllNullableTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
       recursiveClassMap,
     ];
   }
@@ -351,16 +380,21 @@ class AllNullableTypes {
       enumList: (result[18] as List<Object?>?)?.cast<AnEnum?>(),
       objectList: (result[19] as List<Object?>?)?.cast<Object?>(),
       listList: (result[20] as List<Object?>?)?.cast<List<Object?>?>(),
+      mapList: (result[21] as List<Object?>?)?.cast<Map<Object?, Object?>?>(),
       recursiveClassList:
-          (result[21] as List<Object?>?)?.cast<AllNullableTypes?>(),
-      map: result[22] as Map<Object?, Object?>?,
+          (result[22] as List<Object?>?)?.cast<AllNullableTypes?>(),
+      map: result[23] as Map<Object?, Object?>?,
       stringMap:
-          (result[23] as Map<Object?, Object?>?)?.cast<String?, String?>(),
-      intMap: (result[24] as Map<Object?, Object?>?)?.cast<int?, int?>(),
-      enumMap: (result[25] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
+          (result[24] as Map<Object?, Object?>?)?.cast<String?, String?>(),
+      intMap: (result[25] as Map<Object?, Object?>?)?.cast<int?, int?>(),
+      enumMap: (result[26] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
       objectMap:
-          (result[26] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
-      recursiveClassMap: (result[27] as Map<Object?, Object?>?)
+          (result[27] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
+      listMap:
+          (result[28] as Map<Object?, Object?>?)?.cast<int?, List<Object?>?>(),
+      mapMap: (result[29] as Map<Object?, Object?>?)
+          ?.cast<int?, Map<Object?, Object?>?>(),
+      recursiveClassMap: (result[30] as Map<Object?, Object?>?)
           ?.cast<int?, AllNullableTypes?>(),
     );
   }
@@ -391,11 +425,14 @@ class AllNullableTypesWithoutRecursion {
     this.enumList,
     this.objectList,
     this.listList,
+    this.mapList,
     this.map,
     this.stringMap,
     this.intMap,
     this.enumMap,
     this.objectMap,
+    this.listMap,
+    this.mapMap,
   });
 
   bool? aNullableBool;
@@ -438,6 +475,8 @@ class AllNullableTypesWithoutRecursion {
 
   List<List<Object?>?>? listList;
 
+  List<Map<Object?, Object?>?>? mapList;
+
   Map<Object?, Object?>? map;
 
   Map<String?, String?>? stringMap;
@@ -448,6 +487,10 @@ class AllNullableTypesWithoutRecursion {
 
   Map<Object?, Object?>? objectMap;
 
+  Map<int?, List<Object?>?>? listMap;
+
+  Map<int?, Map<Object?, Object?>?>? mapMap;
+
   Object encode() {
     return <Object?>[
       aNullableBool,
@@ -470,11 +513,14 @@ class AllNullableTypesWithoutRecursion {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ];
   }
 
@@ -501,13 +547,18 @@ class AllNullableTypesWithoutRecursion {
       enumList: (result[17] as List<Object?>?)?.cast<AnEnum?>(),
       objectList: (result[18] as List<Object?>?)?.cast<Object?>(),
       listList: (result[19] as List<Object?>?)?.cast<List<Object?>?>(),
-      map: result[20] as Map<Object?, Object?>?,
+      mapList: (result[20] as List<Object?>?)?.cast<Map<Object?, Object?>?>(),
+      map: result[21] as Map<Object?, Object?>?,
       stringMap:
-          (result[21] as Map<Object?, Object?>?)?.cast<String?, String?>(),
-      intMap: (result[22] as Map<Object?, Object?>?)?.cast<int?, int?>(),
-      enumMap: (result[23] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
+          (result[22] as Map<Object?, Object?>?)?.cast<String?, String?>(),
+      intMap: (result[23] as Map<Object?, Object?>?)?.cast<int?, int?>(),
+      enumMap: (result[24] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
       objectMap:
-          (result[24] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
+          (result[25] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
+      listMap:
+          (result[26] as Map<Object?, Object?>?)?.cast<int?, List<Object?>?>(),
+      mapMap: (result[27] as Map<Object?, Object?>?)
+          ?.cast<int?, Map<Object?, Object?>?>(),
     );
   }
 }
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
index 613f80c2490..9e7c18fcd68 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
@@ -526,7 +526,7 @@ final AllNullableTypesWithoutRecursion genericAllNullableTypesWithoutRecursion =
   enumList: enumList,
   objectList: list,
   listList: listList,
-  // mapList: mapList,
+  mapList: mapList,
   map: map,
   stringMap: stringMap,
   intMap: intMap,
@@ -534,8 +534,8 @@ final AllNullableTypesWithoutRecursion genericAllNullableTypesWithoutRecursion =
   // boolMap: boolMap,
   enumMap: enumMap,
   objectMap: map,
-  // listMap: listMap,
-  // mapMap: mapMap,
+  listMap: listMap,
+  mapMap: mapMap,
 );
 
 final List<AllNullableTypesWithoutRecursion?>
@@ -574,7 +574,7 @@ final AllTypes genericAllTypes = AllTypes(
   enumList: nonNullEnumList,
   objectList: nonNullList,
   listList: nonNullListList,
-  // mapList: nonNullMapList,
+  mapList: nonNullMapList,
   map: nonNullMap,
   stringMap: nonNullStringMap,
   intMap: nonNullIntMap,
@@ -582,8 +582,8 @@ final AllTypes genericAllTypes = AllTypes(
   // boolMap: nonNullBoolMap,
   enumMap: nonNullEnumMap,
   objectMap: nonNullMap,
-  // listMap: nonNullListMap,
-  // mapMap: nonNullMapMap,
+  listMap: nonNullListMap,
+  mapMap: nonNullMapMap,
 );
 
 final List<AllTypes?> allTypesClassList = <AllTypes?>[
@@ -616,7 +616,7 @@ final AllNullableTypes genericAllNullableTypes = AllNullableTypes(
   enumList: enumList,
   objectList: list,
   listList: listList,
-  // mapList: mapList,
+  mapList: mapList,
   map: map,
   stringMap: stringMap,
   intMap: intMap,
@@ -624,8 +624,8 @@ final AllNullableTypes genericAllNullableTypes = AllNullableTypes(
   // boolMap: boolMap,
   enumMap: enumMap,
   objectMap: map,
-  // listMap: listMap,
-  // mapMap: mapMap,
+  listMap: listMap,
+  mapMap: mapMap,
 );
 
 final List<AllNullableTypes> nonNullAllNullableTypesList = <AllNullableTypes>[
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
index eac9d2452a6..c5ba2d8b0ca 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
+++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
@@ -102,11 +102,14 @@ data class AllTypes(
     val enumList: List<AnEnum>,
     val objectList: List<Any>,
     val listList: List<List<Any?>>,
+    val mapList: List<Map<Any?, Any?>>,
     val map: Map<Any, Any?>,
     val stringMap: Map<String, String>,
     val intMap: Map<Long, Long>,
     val enumMap: Map<AnEnum, AnEnum>,
-    val objectMap: Map<Any, Any>
+    val objectMap: Map<Any, Any>,
+    val listMap: Map<Long, List<Any?>>,
+    val mapMap: Map<Long, Map<Any?, Any?>>
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): AllTypes {
@@ -130,11 +133,14 @@ data class AllTypes(
       val enumList = pigeonVar_list[17] as List<AnEnum>
       val objectList = pigeonVar_list[18] as List<Any>
       val listList = pigeonVar_list[19] as List<List<Any?>>
-      val map = pigeonVar_list[20] as Map<Any, Any?>
-      val stringMap = pigeonVar_list[21] as Map<String, String>
-      val intMap = pigeonVar_list[22] as Map<Long, Long>
-      val enumMap = pigeonVar_list[23] as Map<AnEnum, AnEnum>
-      val objectMap = pigeonVar_list[24] as Map<Any, Any>
+      val mapList = pigeonVar_list[20] as List<Map<Any?, Any?>>
+      val map = pigeonVar_list[21] as Map<Any, Any?>
+      val stringMap = pigeonVar_list[22] as Map<String, String>
+      val intMap = pigeonVar_list[23] as Map<Long, Long>
+      val enumMap = pigeonVar_list[24] as Map<AnEnum, AnEnum>
+      val objectMap = pigeonVar_list[25] as Map<Any, Any>
+      val listMap = pigeonVar_list[26] as Map<Long, List<Any?>>
+      val mapMap = pigeonVar_list[27] as Map<Long, Map<Any?, Any?>>
       return AllTypes(
           aBool,
           anInt,
@@ -156,11 +162,14 @@ data class AllTypes(
           enumList,
           objectList,
           listList,
+          mapList,
           map,
           stringMap,
           intMap,
           enumMap,
-          objectMap)
+          objectMap,
+          listMap,
+          mapMap)
     }
   }
 
@@ -186,11 +195,14 @@ data class AllTypes(
         enumList,
         objectList,
         listList,
+        mapList,
         map,
         stringMap,
         intMap,
         enumMap,
         objectMap,
+        listMap,
+        mapMap,
     )
   }
 }
@@ -222,12 +234,15 @@ data class AllNullableTypes(
     val enumList: List<AnEnum?>? = null,
     val objectList: List<Any?>? = null,
     val listList: List<List<Any?>?>? = null,
+    val mapList: List<Map<Any?, Any?>?>? = null,
     val recursiveClassList: List<AllNullableTypes?>? = null,
     val map: Map<Any, Any?>? = null,
     val stringMap: Map<String?, String?>? = null,
     val intMap: Map<Long?, Long?>? = null,
     val enumMap: Map<AnEnum?, AnEnum?>? = null,
     val objectMap: Map<Any?, Any?>? = null,
+    val listMap: Map<Long?, List<Any?>?>? = null,
+    val mapMap: Map<Long?, Map<Any?, Any?>?>? = null,
     val recursiveClassMap: Map<Long?, AllNullableTypes?>? = null
 ) {
   companion object {
@@ -253,13 +268,16 @@ data class AllNullableTypes(
       val enumList = pigeonVar_list[18] as List<AnEnum?>?
       val objectList = pigeonVar_list[19] as List<Any?>?
       val listList = pigeonVar_list[20] as List<List<Any?>?>?
-      val recursiveClassList = pigeonVar_list[21] as List<AllNullableTypes?>?
-      val map = pigeonVar_list[22] as Map<Any, Any?>?
-      val stringMap = pigeonVar_list[23] as Map<String?, String?>?
-      val intMap = pigeonVar_list[24] as Map<Long?, Long?>?
-      val enumMap = pigeonVar_list[25] as Map<AnEnum?, AnEnum?>?
-      val objectMap = pigeonVar_list[26] as Map<Any?, Any?>?
-      val recursiveClassMap = pigeonVar_list[27] as Map<Long?, AllNullableTypes?>?
+      val mapList = pigeonVar_list[21] as List<Map<Any?, Any?>?>?
+      val recursiveClassList = pigeonVar_list[22] as List<AllNullableTypes?>?
+      val map = pigeonVar_list[23] as Map<Any, Any?>?
+      val stringMap = pigeonVar_list[24] as Map<String?, String?>?
+      val intMap = pigeonVar_list[25] as Map<Long?, Long?>?
+      val enumMap = pigeonVar_list[26] as Map<AnEnum?, AnEnum?>?
+      val objectMap = pigeonVar_list[27] as Map<Any?, Any?>?
+      val listMap = pigeonVar_list[28] as Map<Long?, List<Any?>?>?
+      val mapMap = pigeonVar_list[29] as Map<Long?, Map<Any?, Any?>?>?
+      val recursiveClassMap = pigeonVar_list[30] as Map<Long?, AllNullableTypes?>?
       return AllNullableTypes(
           aNullableBool,
           aNullableInt,
@@ -282,12 +300,15 @@ data class AllNullableTypes(
           enumList,
           objectList,
           listList,
+          mapList,
           recursiveClassList,
           map,
           stringMap,
           intMap,
           enumMap,
           objectMap,
+          listMap,
+          mapMap,
           recursiveClassMap)
     }
   }
@@ -315,12 +336,15 @@ data class AllNullableTypes(
         enumList,
         objectList,
         listList,
+        mapList,
         recursiveClassList,
         map,
         stringMap,
         intMap,
         enumMap,
         objectMap,
+        listMap,
+        mapMap,
         recursiveClassMap,
     )
   }
@@ -353,11 +377,14 @@ data class AllNullableTypesWithoutRecursion(
     val enumList: List<AnEnum?>? = null,
     val objectList: List<Any?>? = null,
     val listList: List<List<Any?>?>? = null,
+    val mapList: List<Map<Any?, Any?>?>? = null,
     val map: Map<Any, Any?>? = null,
     val stringMap: Map<String?, String?>? = null,
     val intMap: Map<Long?, Long?>? = null,
     val enumMap: Map<AnEnum?, AnEnum?>? = null,
-    val objectMap: Map<Any?, Any?>? = null
+    val objectMap: Map<Any?, Any?>? = null,
+    val listMap: Map<Long?, List<Any?>?>? = null,
+    val mapMap: Map<Long?, Map<Any?, Any?>?>? = null
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): AllNullableTypesWithoutRecursion {
@@ -381,11 +408,14 @@ data class AllNullableTypesWithoutRecursion(
       val enumList = pigeonVar_list[17] as List<AnEnum?>?
       val objectList = pigeonVar_list[18] as List<Any?>?
       val listList = pigeonVar_list[19] as List<List<Any?>?>?
-      val map = pigeonVar_list[20] as Map<Any, Any?>?
-      val stringMap = pigeonVar_list[21] as Map<String?, String?>?
-      val intMap = pigeonVar_list[22] as Map<Long?, Long?>?
-      val enumMap = pigeonVar_list[23] as Map<AnEnum?, AnEnum?>?
-      val objectMap = pigeonVar_list[24] as Map<Any?, Any?>?
+      val mapList = pigeonVar_list[20] as List<Map<Any?, Any?>?>?
+      val map = pigeonVar_list[21] as Map<Any, Any?>?
+      val stringMap = pigeonVar_list[22] as Map<String?, String?>?
+      val intMap = pigeonVar_list[23] as Map<Long?, Long?>?
+      val enumMap = pigeonVar_list[24] as Map<AnEnum?, AnEnum?>?
+      val objectMap = pigeonVar_list[25] as Map<Any?, Any?>?
+      val listMap = pigeonVar_list[26] as Map<Long?, List<Any?>?>?
+      val mapMap = pigeonVar_list[27] as Map<Long?, Map<Any?, Any?>?>?
       return AllNullableTypesWithoutRecursion(
           aNullableBool,
           aNullableInt,
@@ -407,11 +437,14 @@ data class AllNullableTypesWithoutRecursion(
           enumList,
           objectList,
           listList,
+          mapList,
           map,
           stringMap,
           intMap,
           enumMap,
-          objectMap)
+          objectMap,
+          listMap,
+          mapMap)
     }
   }
 
@@ -437,11 +470,14 @@ data class AllNullableTypesWithoutRecursion(
         enumList,
         objectList,
         listList,
+        mapList,
         map,
         stringMap,
         intMap,
         enumMap,
         objectMap,
+        listMap,
+        mapMap,
     )
   }
 }
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
index 25c771ee576..aa42535f718 100644
--- a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
+++ b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
@@ -66,9 +66,12 @@ internal class AllDatatypesTest {
     assertEquals(firstTypes.intList, secondTypes.intList)
     assertEquals(firstTypes.stringList, secondTypes.stringList)
     assertEquals(firstTypes.listList, secondTypes.listList)
+    assertEquals(firstTypes.mapList, secondTypes.mapList)
     assertEquals(firstTypes.map, secondTypes.map)
     assertEquals(firstTypes.stringMap, secondTypes.stringMap)
     assertEquals(firstTypes.intMap, secondTypes.intMap)
+    assertEquals(firstTypes.listMap, secondTypes.listMap)
+    assertEquals(firstTypes.mapMap, secondTypes.mapMap)
   }
 
   @Test
@@ -120,10 +123,13 @@ internal class AllDatatypesTest {
             doubleList = listOf(1.1, 2.2),
             objectList = listOf(1, 2, 3),
             listList = listOf(stringList, stringList.toList()),
+            mapList = listOf(mapOf("hello" to 1234), mapOf("hello" to 1234)),
             map = mapOf("hello" to 1234),
             stringMap = mapOf("hello" to "you"),
             intMap = mapOf(1L to 0L),
-            objectMap = mapOf("hello" to 1234))
+            objectMap = mapOf("hello" to 1234),
+            listMap = mapOf(1L to stringList),
+            mapMap = mapOf(1L to mapOf()))
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = FlutterIntegrationCoreApi(binaryMessenger)
 
diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
index adfdc9ea8ed..d35390a794c 100644
--- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
+++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
@@ -64,10 +64,13 @@ class AllDatatypesTests: XCTestCase {
       boolList: [true, false],
       objectList: ["string", 2],
       listList: [[true], [false]],
+      mapList: [["hello": 1234], ["hello": 1234]],
       map: ["hello": 1234],
       stringMap: ["hello": "you"],
       intMap: [1: 0],
-      objectMap: ["hello": 1234]
+      objectMap: ["hello": 1234],
+      listMap: [1234: ["string", 2]],
+      mapMap: [1234: ["hello": 1234]]
     )
 
     let binaryMessenger = EchoBinaryMessenger(codec: CoreTestsPigeonCodec.shared)
@@ -98,10 +101,25 @@ class AllDatatypesTests: XCTestCase {
             XCTAssert(equalsList(list, everything.listList![index]))
           }
         }
+        if res!.mapList != nil {
+          for (index, map) in res!.mapList!.enumerated() {
+            XCTAssert(equalsDictionary(map, everything.mapList![index]))
+          }
+        }
         XCTAssert(equalsDictionary(res!.map, everything.map))
         XCTAssert(equalsDictionary(res!.stringMap, everything.stringMap))
         XCTAssert(equalsDictionary(res!.intMap, everything.intMap))
         XCTAssert(equalsDictionary(res!.objectMap, everything.objectMap))
+        if res!.listMap != nil {
+          for (index, list) in res!.listMap! {
+            XCTAssert(equalsList(list, everything.listMap![index]!))
+          }
+        }
+        if res!.mapMap != nil {
+          for (index, map) in res!.mapMap! {
+            XCTAssert(equalsDictionary(map, everything.mapMap![index]!))
+          }
+        }
         expectation.fulfill()
         return
       case .failure(_):
diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
index 0101cd8c075..2b2001d6aa4 100644
--- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
+++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
@@ -129,11 +129,14 @@ struct AllTypes {
   var enumList: [AnEnum]
   var objectList: [Any]
   var listList: [[Any?]]
+  var mapList: [[AnyHashable?: Any?]]
   var map: [AnyHashable?: Any?]
   var stringMap: [String: String]
   var intMap: [Int64: Int64]
   var enumMap: [AnEnum: AnEnum]
   var objectMap: [AnyHashable: Any]
+  var listMap: [Int64: [Any?]]
+  var mapMap: [Int64: [AnyHashable?: Any?]]
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllTypes? {
@@ -157,11 +160,14 @@ struct AllTypes {
     let enumList = pigeonVar_list[17] as! [AnEnum]
     let objectList = pigeonVar_list[18] as! [Any]
     let listList = pigeonVar_list[19] as! [[Any?]]
-    let map = pigeonVar_list[20] as! [AnyHashable?: Any?]
-    let stringMap = pigeonVar_list[21] as! [String: String]
-    let intMap = pigeonVar_list[22] as! [Int64: Int64]
-    let enumMap = pigeonVar_list[23] as? [AnEnum: AnEnum]
-    let objectMap = pigeonVar_list[24] as! [AnyHashable: Any]
+    let mapList = pigeonVar_list[20] as! [[AnyHashable?: Any?]]
+    let map = pigeonVar_list[21] as! [AnyHashable?: Any?]
+    let stringMap = pigeonVar_list[22] as! [String: String]
+    let intMap = pigeonVar_list[23] as! [Int64: Int64]
+    let enumMap = pigeonVar_list[24] as? [AnEnum: AnEnum]
+    let objectMap = pigeonVar_list[25] as! [AnyHashable: Any]
+    let listMap = pigeonVar_list[26] as! [Int64: [Any?]]
+    let mapMap = pigeonVar_list[27] as! [Int64: [AnyHashable?: Any?]]
 
     return AllTypes(
       aBool: aBool,
@@ -184,11 +190,14 @@ struct AllTypes {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap!,
-      objectMap: objectMap
+      objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap
     )
   }
   func toList() -> [Any?] {
@@ -213,11 +222,14 @@ struct AllTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ]
   }
 }
@@ -248,12 +260,15 @@ class AllNullableTypes {
     enumList: [AnEnum?]? = nil,
     objectList: [Any?]? = nil,
     listList: [[Any?]?]? = nil,
+    mapList: [[AnyHashable?: Any?]?]? = nil,
     recursiveClassList: [AllNullableTypes?]? = nil,
     map: [AnyHashable?: Any?]? = nil,
     stringMap: [String?: String?]? = nil,
     intMap: [Int64?: Int64?]? = nil,
     enumMap: [AnEnum?: AnEnum?]? = nil,
     objectMap: [AnyHashable?: Any?]? = nil,
+    listMap: [Int64?: [Any?]?]? = nil,
+    mapMap: [Int64?: [AnyHashable?: Any?]?]? = nil,
     recursiveClassMap: [Int64?: AllNullableTypes?]? = nil
   ) {
     self.aNullableBool = aNullableBool
@@ -277,12 +292,15 @@ class AllNullableTypes {
     self.enumList = enumList
     self.objectList = objectList
     self.listList = listList
+    self.mapList = mapList
     self.recursiveClassList = recursiveClassList
     self.map = map
     self.stringMap = stringMap
     self.intMap = intMap
     self.enumMap = enumMap
     self.objectMap = objectMap
+    self.listMap = listMap
+    self.mapMap = mapMap
     self.recursiveClassMap = recursiveClassMap
   }
   var aNullableBool: Bool?
@@ -306,12 +324,15 @@ class AllNullableTypes {
   var enumList: [AnEnum?]?
   var objectList: [Any?]?
   var listList: [[Any?]?]?
+  var mapList: [[AnyHashable?: Any?]?]?
   var recursiveClassList: [AllNullableTypes?]?
   var map: [AnyHashable?: Any?]?
   var stringMap: [String?: String?]?
   var intMap: [Int64?: Int64?]?
   var enumMap: [AnEnum?: AnEnum?]?
   var objectMap: [AnyHashable?: Any?]?
+  var listMap: [Int64?: [Any?]?]?
+  var mapMap: [Int64?: [AnyHashable?: Any?]?]?
   var recursiveClassMap: [Int64?: AllNullableTypes?]?
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -337,13 +358,16 @@ class AllNullableTypes {
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[18])
     let objectList: [Any?]? = nilOrValue(pigeonVar_list[19])
     let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[20])
-    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[21])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[22])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[23])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[24])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[25] as? [AnEnum?: AnEnum?]
-    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[26])
-    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[27])
+    let mapList: [[AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[21])
+    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[22])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[23])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[24])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[25])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[26] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[27])
+    let listMap: [Int64?: [Any?]?]? = nilOrValue(pigeonVar_list[28])
+    let mapMap: [Int64?: [AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[29])
+    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[30])
 
     return AllNullableTypes(
       aNullableBool: aNullableBool,
@@ -367,12 +391,15 @@ class AllNullableTypes {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       recursiveClassList: recursiveClassList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
       objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap,
       recursiveClassMap: recursiveClassMap
     )
   }
@@ -399,12 +426,15 @@ class AllNullableTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
       recursiveClassMap,
     ]
   }
@@ -436,11 +466,14 @@ struct AllNullableTypesWithoutRecursion {
   var enumList: [AnEnum?]? = nil
   var objectList: [Any?]? = nil
   var listList: [[Any?]?]? = nil
+  var mapList: [[AnyHashable?: Any?]?]? = nil
   var map: [AnyHashable?: Any?]? = nil
   var stringMap: [String?: String?]? = nil
   var intMap: [Int64?: Int64?]? = nil
   var enumMap: [AnEnum?: AnEnum?]? = nil
   var objectMap: [AnyHashable?: Any?]? = nil
+  var listMap: [Int64?: [Any?]?]? = nil
+  var mapMap: [Int64?: [AnyHashable?: Any?]?]? = nil
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllNullableTypesWithoutRecursion? {
@@ -464,11 +497,14 @@ struct AllNullableTypesWithoutRecursion {
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[17])
     let objectList: [Any?]? = nilOrValue(pigeonVar_list[18])
     let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[20])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[21])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[22])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[23] as? [AnEnum?: AnEnum?]
-    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[24])
+    let mapList: [[AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[20])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[21])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[22])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[23])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[24] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[25])
+    let listMap: [Int64?: [Any?]?]? = nilOrValue(pigeonVar_list[26])
+    let mapMap: [Int64?: [AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[27])
 
     return AllNullableTypesWithoutRecursion(
       aNullableBool: aNullableBool,
@@ -491,11 +527,14 @@ struct AllNullableTypesWithoutRecursion {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
-      objectMap: objectMap
+      objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap
     )
   }
   func toList() -> [Any?] {
@@ -520,11 +559,14 @@ struct AllNullableTypesWithoutRecursion {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ]
   }
 }
diff --git a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
index fd388faa3e7..5701f91c235 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
+++ b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.cc
@@ -96,11 +96,14 @@ struct _CoreTestsPigeonTestAllTypes {
   FlValue* enum_list;
   FlValue* object_list;
   FlValue* list_list;
+  FlValue* map_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
   FlValue* object_map;
+  FlValue* list_map;
+  FlValue* map_map;
 };
 
 G_DEFINE_TYPE(CoreTestsPigeonTestAllTypes, core_tests_pigeon_test_all_types,
@@ -118,11 +121,14 @@ static void core_tests_pigeon_test_all_types_dispose(GObject* object) {
   g_clear_pointer(&self->enum_list, fl_value_unref);
   g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
+  g_clear_pointer(&self->map_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
   g_clear_pointer(&self->object_map, fl_value_unref);
+  g_clear_pointer(&self->list_map, fl_value_unref);
+  g_clear_pointer(&self->map_map, fl_value_unref);
   G_OBJECT_CLASS(core_tests_pigeon_test_all_types_parent_class)
       ->dispose(object);
 }
@@ -145,8 +151,9 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
     CoreTestsPigeonTestAnotherEnum another_enum, const gchar* a_string,
     FlValue* an_object, FlValue* list, FlValue* string_list, FlValue* int_list,
     FlValue* double_list, FlValue* bool_list, FlValue* enum_list,
-    FlValue* object_list, FlValue* list_list, FlValue* map, FlValue* string_map,
-    FlValue* int_map, FlValue* enum_map, FlValue* object_map) {
+    FlValue* object_list, FlValue* list_list, FlValue* map_list, FlValue* map,
+    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* list_map, FlValue* map_map) {
   CoreTestsPigeonTestAllTypes* self = CORE_TESTS_PIGEON_TEST_ALL_TYPES(
       g_object_new(core_tests_pigeon_test_all_types_get_type(), nullptr));
   self->a_bool = a_bool;
@@ -180,11 +187,14 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
   self->enum_list = fl_value_ref(enum_list);
   self->object_list = fl_value_ref(object_list);
   self->list_list = fl_value_ref(list_list);
+  self->map_list = fl_value_ref(map_list);
   self->map = fl_value_ref(map);
   self->string_map = fl_value_ref(string_map);
   self->int_map = fl_value_ref(int_map);
   self->enum_map = fl_value_ref(enum_map);
   self->object_map = fl_value_ref(object_map);
+  self->list_map = fl_value_ref(list_map);
+  self->map_map = fl_value_ref(map_map);
   return self;
 }
 
@@ -315,6 +325,12 @@ FlValue* core_tests_pigeon_test_all_types_get_list_list(
   return self->list_list;
 }
 
+FlValue* core_tests_pigeon_test_all_types_get_map_list(
+    CoreTestsPigeonTestAllTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
+  return self->map_list;
+}
+
 FlValue* core_tests_pigeon_test_all_types_get_map(
     CoreTestsPigeonTestAllTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
@@ -345,6 +361,18 @@ FlValue* core_tests_pigeon_test_all_types_get_object_map(
   return self->object_map;
 }
 
+FlValue* core_tests_pigeon_test_all_types_get_list_map(
+    CoreTestsPigeonTestAllTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
+  return self->list_map;
+}
+
+FlValue* core_tests_pigeon_test_all_types_get_map_map(
+    CoreTestsPigeonTestAllTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_TYPES(self), nullptr);
+  return self->map_map;
+}
+
 static FlValue* core_tests_pigeon_test_all_types_to_list(
     CoreTestsPigeonTestAllTypes* self) {
   FlValue* values = fl_value_new_list();
@@ -380,11 +408,14 @@ static FlValue* core_tests_pigeon_test_all_types_to_list(
   fl_value_append_take(values, fl_value_ref(self->enum_list));
   fl_value_append_take(values, fl_value_ref(self->object_list));
   fl_value_append_take(values, fl_value_ref(self->list_list));
+  fl_value_append_take(values, fl_value_ref(self->map_list));
   fl_value_append_take(values, fl_value_ref(self->map));
   fl_value_append_take(values, fl_value_ref(self->string_map));
   fl_value_append_take(values, fl_value_ref(self->int_map));
   fl_value_append_take(values, fl_value_ref(self->enum_map));
   fl_value_append_take(values, fl_value_ref(self->object_map));
+  fl_value_append_take(values, fl_value_ref(self->list_map));
+  fl_value_append_take(values, fl_value_ref(self->map_map));
   return values;
 }
 
@@ -440,21 +471,28 @@ core_tests_pigeon_test_all_types_new_from_list(FlValue* values) {
   FlValue* value19 = fl_value_get_list_value(values, 19);
   FlValue* list_list = value19;
   FlValue* value20 = fl_value_get_list_value(values, 20);
-  FlValue* map = value20;
+  FlValue* map_list = value20;
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* string_map = value21;
+  FlValue* map = value21;
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* int_map = value22;
+  FlValue* string_map = value22;
   FlValue* value23 = fl_value_get_list_value(values, 23);
-  FlValue* enum_map = value23;
+  FlValue* int_map = value23;
   FlValue* value24 = fl_value_get_list_value(values, 24);
-  FlValue* object_map = value24;
+  FlValue* enum_map = value24;
+  FlValue* value25 = fl_value_get_list_value(values, 25);
+  FlValue* object_map = value25;
+  FlValue* value26 = fl_value_get_list_value(values, 26);
+  FlValue* list_map = value26;
+  FlValue* value27 = fl_value_get_list_value(values, 27);
+  FlValue* map_map = value27;
   return core_tests_pigeon_test_all_types_new(
       a_bool, an_int, an_int64, a_double, a_byte_array, a_byte_array_length,
       a4_byte_array, a4_byte_array_length, a8_byte_array, a8_byte_array_length,
       a_float_array, a_float_array_length, an_enum, another_enum, a_string,
       an_object, list, string_list, int_list, double_list, bool_list, enum_list,
-      object_list, list_list, map, string_map, int_map, enum_map, object_map);
+      object_list, list_list, map_list, map, string_map, int_map, enum_map,
+      object_map, list_map, map_map);
 }
 
 struct _CoreTestsPigeonTestAllNullableTypes {
@@ -485,12 +523,15 @@ struct _CoreTestsPigeonTestAllNullableTypes {
   FlValue* enum_list;
   FlValue* object_list;
   FlValue* list_list;
+  FlValue* map_list;
   FlValue* recursive_class_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
   FlValue* object_map;
+  FlValue* list_map;
+  FlValue* map_map;
   FlValue* recursive_class_map;
 };
 
@@ -517,12 +558,15 @@ static void core_tests_pigeon_test_all_nullable_types_dispose(GObject* object) {
   g_clear_pointer(&self->enum_list, fl_value_unref);
   g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
+  g_clear_pointer(&self->map_list, fl_value_unref);
   g_clear_pointer(&self->recursive_class_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
   g_clear_pointer(&self->object_map, fl_value_unref);
+  g_clear_pointer(&self->list_map, fl_value_unref);
+  g_clear_pointer(&self->map_map, fl_value_unref);
   g_clear_pointer(&self->recursive_class_map, fl_value_unref);
   G_OBJECT_CLASS(core_tests_pigeon_test_all_nullable_types_parent_class)
       ->dispose(object);
@@ -551,9 +595,10 @@ core_tests_pigeon_test_all_nullable_types_new(
     CoreTestsPigeonTestAllNullableTypes* all_nullable_types, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
     FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
-    FlValue* list_list, FlValue* recursive_class_list, FlValue* map,
-    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
-    FlValue* object_map, FlValue* recursive_class_map) {
+    FlValue* list_list, FlValue* map_list, FlValue* recursive_class_list,
+    FlValue* map, FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* list_map, FlValue* map_map,
+    FlValue* recursive_class_map) {
   CoreTestsPigeonTestAllNullableTypes* self =
       CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES(g_object_new(
           core_tests_pigeon_test_all_nullable_types_get_type(), nullptr));
@@ -690,6 +735,11 @@ core_tests_pigeon_test_all_nullable_types_new(
   } else {
     self->list_list = nullptr;
   }
+  if (map_list != nullptr) {
+    self->map_list = fl_value_ref(map_list);
+  } else {
+    self->map_list = nullptr;
+  }
   if (recursive_class_list != nullptr) {
     self->recursive_class_list = fl_value_ref(recursive_class_list);
   } else {
@@ -720,6 +770,16 @@ core_tests_pigeon_test_all_nullable_types_new(
   } else {
     self->object_map = nullptr;
   }
+  if (list_map != nullptr) {
+    self->list_map = fl_value_ref(list_map);
+  } else {
+    self->list_map = nullptr;
+  }
+  if (map_map != nullptr) {
+    self->map_map = fl_value_ref(map_map);
+  } else {
+    self->map_map = nullptr;
+  }
   if (recursive_class_map != nullptr) {
     self->recursive_class_map = fl_value_ref(recursive_class_map);
   } else {
@@ -886,6 +946,13 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_list_list(
   return self->list_list;
 }
 
+FlValue* core_tests_pigeon_test_all_nullable_types_get_map_list(
+    CoreTestsPigeonTestAllNullableTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
+                       nullptr);
+  return self->map_list;
+}
+
 FlValue* core_tests_pigeon_test_all_nullable_types_get_recursive_class_list(
     CoreTestsPigeonTestAllNullableTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
@@ -928,6 +995,20 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_object_map(
   return self->object_map;
 }
 
+FlValue* core_tests_pigeon_test_all_nullable_types_get_list_map(
+    CoreTestsPigeonTestAllNullableTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
+                       nullptr);
+  return self->list_map;
+}
+
+FlValue* core_tests_pigeon_test_all_nullable_types_get_map_map(
+    CoreTestsPigeonTestAllNullableTypes* self) {
+  g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
+                       nullptr);
+  return self->map_map;
+}
+
 FlValue* core_tests_pigeon_test_all_nullable_types_get_recursive_class_map(
     CoreTestsPigeonTestAllNullableTypes* self) {
   g_return_val_if_fail(CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES(self),
@@ -1018,6 +1099,9 @@ static FlValue* core_tests_pigeon_test_all_nullable_types_to_list(
   fl_value_append_take(values, self->list_list != nullptr
                                    ? fl_value_ref(self->list_list)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->map_list != nullptr
+                                   ? fl_value_ref(self->map_list)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->recursive_class_list != nullptr
                                    ? fl_value_ref(self->recursive_class_list)
                                    : fl_value_new_null());
@@ -1035,6 +1119,12 @@ static FlValue* core_tests_pigeon_test_all_nullable_types_to_list(
   fl_value_append_take(values, self->object_map != nullptr
                                    ? fl_value_ref(self->object_map)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->list_map != nullptr
+                                   ? fl_value_ref(self->list_map)
+                                   : fl_value_new_null());
+  fl_value_append_take(values, self->map_map != nullptr
+                                   ? fl_value_ref(self->map_map)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->recursive_class_map != nullptr
                                    ? fl_value_ref(self->recursive_class_map)
                                    : fl_value_new_null());
@@ -1174,39 +1264,54 @@ core_tests_pigeon_test_all_nullable_types_new_from_list(FlValue* values) {
     list_list = value20;
   }
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* recursive_class_list = nullptr;
+  FlValue* map_list = nullptr;
   if (fl_value_get_type(value21) != FL_VALUE_TYPE_NULL) {
-    recursive_class_list = value21;
+    map_list = value21;
   }
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* map = nullptr;
+  FlValue* recursive_class_list = nullptr;
   if (fl_value_get_type(value22) != FL_VALUE_TYPE_NULL) {
-    map = value22;
+    recursive_class_list = value22;
   }
   FlValue* value23 = fl_value_get_list_value(values, 23);
-  FlValue* string_map = nullptr;
+  FlValue* map = nullptr;
   if (fl_value_get_type(value23) != FL_VALUE_TYPE_NULL) {
-    string_map = value23;
+    map = value23;
   }
   FlValue* value24 = fl_value_get_list_value(values, 24);
-  FlValue* int_map = nullptr;
+  FlValue* string_map = nullptr;
   if (fl_value_get_type(value24) != FL_VALUE_TYPE_NULL) {
-    int_map = value24;
+    string_map = value24;
   }
   FlValue* value25 = fl_value_get_list_value(values, 25);
-  FlValue* enum_map = nullptr;
+  FlValue* int_map = nullptr;
   if (fl_value_get_type(value25) != FL_VALUE_TYPE_NULL) {
-    enum_map = value25;
+    int_map = value25;
   }
   FlValue* value26 = fl_value_get_list_value(values, 26);
-  FlValue* object_map = nullptr;
+  FlValue* enum_map = nullptr;
   if (fl_value_get_type(value26) != FL_VALUE_TYPE_NULL) {
-    object_map = value26;
+    enum_map = value26;
   }
   FlValue* value27 = fl_value_get_list_value(values, 27);
-  FlValue* recursive_class_map = nullptr;
+  FlValue* object_map = nullptr;
   if (fl_value_get_type(value27) != FL_VALUE_TYPE_NULL) {
-    recursive_class_map = value27;
+    object_map = value27;
+  }
+  FlValue* value28 = fl_value_get_list_value(values, 28);
+  FlValue* list_map = nullptr;
+  if (fl_value_get_type(value28) != FL_VALUE_TYPE_NULL) {
+    list_map = value28;
+  }
+  FlValue* value29 = fl_value_get_list_value(values, 29);
+  FlValue* map_map = nullptr;
+  if (fl_value_get_type(value29) != FL_VALUE_TYPE_NULL) {
+    map_map = value29;
+  }
+  FlValue* value30 = fl_value_get_list_value(values, 30);
+  FlValue* recursive_class_map = nullptr;
+  if (fl_value_get_type(value30) != FL_VALUE_TYPE_NULL) {
+    recursive_class_map = value30;
   }
   return core_tests_pigeon_test_all_nullable_types_new(
       a_nullable_bool, a_nullable_int, a_nullable_int64, a_nullable_double,
@@ -1216,8 +1321,9 @@ core_tests_pigeon_test_all_nullable_types_new_from_list(FlValue* values) {
       a_nullable_float_array, a_nullable_float_array_length, a_nullable_enum,
       another_nullable_enum, a_nullable_string, a_nullable_object,
       all_nullable_types, list, string_list, int_list, double_list, bool_list,
-      enum_list, object_list, list_list, recursive_class_list, map, string_map,
-      int_map, enum_map, object_map, recursive_class_map);
+      enum_list, object_list, list_list, map_list, recursive_class_list, map,
+      string_map, int_map, enum_map, object_map, list_map, map_map,
+      recursive_class_map);
 }
 
 struct _CoreTestsPigeonTestAllNullableTypesWithoutRecursion {
@@ -1247,11 +1353,14 @@ struct _CoreTestsPigeonTestAllNullableTypesWithoutRecursion {
   FlValue* enum_list;
   FlValue* object_list;
   FlValue* list_list;
+  FlValue* map_list;
   FlValue* map;
   FlValue* string_map;
   FlValue* int_map;
   FlValue* enum_map;
   FlValue* object_map;
+  FlValue* list_map;
+  FlValue* map_map;
 };
 
 G_DEFINE_TYPE(CoreTestsPigeonTestAllNullableTypesWithoutRecursion,
@@ -1278,11 +1387,14 @@ static void core_tests_pigeon_test_all_nullable_types_without_recursion_dispose(
   g_clear_pointer(&self->enum_list, fl_value_unref);
   g_clear_pointer(&self->object_list, fl_value_unref);
   g_clear_pointer(&self->list_list, fl_value_unref);
+  g_clear_pointer(&self->map_list, fl_value_unref);
   g_clear_pointer(&self->map, fl_value_unref);
   g_clear_pointer(&self->string_map, fl_value_unref);
   g_clear_pointer(&self->int_map, fl_value_unref);
   g_clear_pointer(&self->enum_map, fl_value_unref);
   g_clear_pointer(&self->object_map, fl_value_unref);
+  g_clear_pointer(&self->list_map, fl_value_unref);
+  g_clear_pointer(&self->map_map, fl_value_unref);
   G_OBJECT_CLASS(
       core_tests_pigeon_test_all_nullable_types_without_recursion_parent_class)
       ->dispose(object);
@@ -1311,8 +1423,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
     const gchar* a_nullable_string, FlValue* a_nullable_object, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
     FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
-    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
-    FlValue* enum_map, FlValue* object_map) {
+    FlValue* list_list, FlValue* map_list, FlValue* map, FlValue* string_map,
+    FlValue* int_map, FlValue* enum_map, FlValue* object_map, FlValue* list_map,
+    FlValue* map_map) {
   CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self =
       CORE_TESTS_PIGEON_TEST_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(g_object_new(
           core_tests_pigeon_test_all_nullable_types_without_recursion_get_type(),
@@ -1444,6 +1557,11 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
   } else {
     self->list_list = nullptr;
   }
+  if (map_list != nullptr) {
+    self->map_list = fl_value_ref(map_list);
+  } else {
+    self->map_list = nullptr;
+  }
   if (map != nullptr) {
     self->map = fl_value_ref(map);
   } else {
@@ -1469,6 +1587,16 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
   } else {
     self->object_map = nullptr;
   }
+  if (list_map != nullptr) {
+    self->list_map = fl_value_ref(list_map);
+  } else {
+    self->list_map = nullptr;
+  }
+  if (map_map != nullptr) {
+    self->map_map = fl_value_ref(map_map);
+  } else {
+    self->map_map = nullptr;
+  }
   return self;
 }
 
@@ -1655,6 +1783,15 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_list(
   return self->list_list;
 }
 
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_list(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(self),
+      nullptr);
+  return self->map_list;
+}
+
 FlValue* core_tests_pigeon_test_all_nullable_types_without_recursion_get_map(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
   g_return_val_if_fail(
@@ -1699,6 +1836,24 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_map(
   return self->object_map;
 }
 
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(self),
+      nullptr);
+  return self->list_map;
+}
+
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
+  g_return_val_if_fail(
+      CORE_TESTS_PIGEON_TEST_IS_ALL_NULLABLE_TYPES_WITHOUT_RECURSION(self),
+      nullptr);
+  return self->map_map;
+}
+
 static FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* self) {
@@ -1778,6 +1933,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
   fl_value_append_take(values, self->list_list != nullptr
                                    ? fl_value_ref(self->list_list)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->map_list != nullptr
+                                   ? fl_value_ref(self->map_list)
+                                   : fl_value_new_null());
   fl_value_append_take(values, self->map != nullptr ? fl_value_ref(self->map)
                                                     : fl_value_new_null());
   fl_value_append_take(values, self->string_map != nullptr
@@ -1792,6 +1950,12 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_to_list(
   fl_value_append_take(values, self->object_map != nullptr
                                    ? fl_value_ref(self->object_map)
                                    : fl_value_new_null());
+  fl_value_append_take(values, self->list_map != nullptr
+                                   ? fl_value_ref(self->list_map)
+                                   : fl_value_new_null());
+  fl_value_append_take(values, self->map_map != nullptr
+                                   ? fl_value_ref(self->map_map)
+                                   : fl_value_new_null());
   return values;
 }
 
@@ -1923,29 +2087,44 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new_from_list(
     list_list = value19;
   }
   FlValue* value20 = fl_value_get_list_value(values, 20);
-  FlValue* map = nullptr;
+  FlValue* map_list = nullptr;
   if (fl_value_get_type(value20) != FL_VALUE_TYPE_NULL) {
-    map = value20;
+    map_list = value20;
   }
   FlValue* value21 = fl_value_get_list_value(values, 21);
-  FlValue* string_map = nullptr;
+  FlValue* map = nullptr;
   if (fl_value_get_type(value21) != FL_VALUE_TYPE_NULL) {
-    string_map = value21;
+    map = value21;
   }
   FlValue* value22 = fl_value_get_list_value(values, 22);
-  FlValue* int_map = nullptr;
+  FlValue* string_map = nullptr;
   if (fl_value_get_type(value22) != FL_VALUE_TYPE_NULL) {
-    int_map = value22;
+    string_map = value22;
   }
   FlValue* value23 = fl_value_get_list_value(values, 23);
-  FlValue* enum_map = nullptr;
+  FlValue* int_map = nullptr;
   if (fl_value_get_type(value23) != FL_VALUE_TYPE_NULL) {
-    enum_map = value23;
+    int_map = value23;
   }
   FlValue* value24 = fl_value_get_list_value(values, 24);
-  FlValue* object_map = nullptr;
+  FlValue* enum_map = nullptr;
   if (fl_value_get_type(value24) != FL_VALUE_TYPE_NULL) {
-    object_map = value24;
+    enum_map = value24;
+  }
+  FlValue* value25 = fl_value_get_list_value(values, 25);
+  FlValue* object_map = nullptr;
+  if (fl_value_get_type(value25) != FL_VALUE_TYPE_NULL) {
+    object_map = value25;
+  }
+  FlValue* value26 = fl_value_get_list_value(values, 26);
+  FlValue* list_map = nullptr;
+  if (fl_value_get_type(value26) != FL_VALUE_TYPE_NULL) {
+    list_map = value26;
+  }
+  FlValue* value27 = fl_value_get_list_value(values, 27);
+  FlValue* map_map = nullptr;
+  if (fl_value_get_type(value27) != FL_VALUE_TYPE_NULL) {
+    map_map = value27;
   }
   return core_tests_pigeon_test_all_nullable_types_without_recursion_new(
       a_nullable_bool, a_nullable_int, a_nullable_int64, a_nullable_double,
@@ -1955,7 +2134,8 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new_from_list(
       a_nullable_float_array, a_nullable_float_array_length, a_nullable_enum,
       another_nullable_enum, a_nullable_string, a_nullable_object, list,
       string_list, int_list, double_list, bool_list, enum_list, object_list,
-      list_list, map, string_map, int_map, enum_map, object_map);
+      list_list, map_list, map, string_map, int_map, enum_map, object_map,
+      list_map, map_map);
 }
 
 struct _CoreTestsPigeonTestAllClassesWrapper {
diff --git a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
index 94e6eb35d0e..6cb79ba1854 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
+++ b/packages/pigeon/platform_tests/test_plugin/linux/pigeon/core_tests.gen.h
@@ -105,11 +105,14 @@ G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestAllTypes,
  * enum_list: field in this object.
  * object_list: field in this object.
  * list_list: field in this object.
+ * map_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
  * object_map: field in this object.
+ * list_map: field in this object.
+ * map_map: field in this object.
  *
  * Creates a new #AllTypes object.
  *
@@ -125,8 +128,9 @@ CoreTestsPigeonTestAllTypes* core_tests_pigeon_test_all_types_new(
     CoreTestsPigeonTestAnotherEnum another_enum, const gchar* a_string,
     FlValue* an_object, FlValue* list, FlValue* string_list, FlValue* int_list,
     FlValue* double_list, FlValue* bool_list, FlValue* enum_list,
-    FlValue* object_list, FlValue* list_list, FlValue* map, FlValue* string_map,
-    FlValue* int_map, FlValue* enum_map, FlValue* object_map);
+    FlValue* object_list, FlValue* list_list, FlValue* map_list, FlValue* map,
+    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* list_map, FlValue* map_map);
 
 /**
  * core_tests_pigeon_test_all_types_get_a_bool
@@ -353,6 +357,17 @@ FlValue* core_tests_pigeon_test_all_types_get_object_list(
 FlValue* core_tests_pigeon_test_all_types_get_list_list(
     CoreTestsPigeonTestAllTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_types_get_map_list
+ * @object: a #CoreTestsPigeonTestAllTypes.
+ *
+ * Gets the value of the mapList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_types_get_map_list(
+    CoreTestsPigeonTestAllTypes* object);
+
 /**
  * core_tests_pigeon_test_all_types_get_map
  * @object: a #CoreTestsPigeonTestAllTypes.
@@ -408,6 +423,28 @@ FlValue* core_tests_pigeon_test_all_types_get_enum_map(
 FlValue* core_tests_pigeon_test_all_types_get_object_map(
     CoreTestsPigeonTestAllTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_types_get_list_map
+ * @object: a #CoreTestsPigeonTestAllTypes.
+ *
+ * Gets the value of the listMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_types_get_list_map(
+    CoreTestsPigeonTestAllTypes* object);
+
+/**
+ * core_tests_pigeon_test_all_types_get_map_map
+ * @object: a #CoreTestsPigeonTestAllTypes.
+ *
+ * Gets the value of the mapMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_types_get_map_map(
+    CoreTestsPigeonTestAllTypes* object);
+
 /**
  * CoreTestsPigeonTestAllNullableTypes:
  *
@@ -445,12 +482,15 @@ G_DECLARE_FINAL_TYPE(CoreTestsPigeonTestAllNullableTypes,
  * enum_list: field in this object.
  * object_list: field in this object.
  * list_list: field in this object.
+ * map_list: field in this object.
  * recursive_class_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
  * object_map: field in this object.
+ * list_map: field in this object.
+ * map_map: field in this object.
  * recursive_class_map: field in this object.
  *
  * Creates a new #AllNullableTypes object.
@@ -471,9 +511,10 @@ core_tests_pigeon_test_all_nullable_types_new(
     CoreTestsPigeonTestAllNullableTypes* all_nullable_types, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
     FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
-    FlValue* list_list, FlValue* recursive_class_list, FlValue* map,
-    FlValue* string_map, FlValue* int_map, FlValue* enum_map,
-    FlValue* object_map, FlValue* recursive_class_map);
+    FlValue* list_list, FlValue* map_list, FlValue* recursive_class_list,
+    FlValue* map, FlValue* string_map, FlValue* int_map, FlValue* enum_map,
+    FlValue* object_map, FlValue* list_map, FlValue* map_map,
+    FlValue* recursive_class_map);
 
 /**
  * core_tests_pigeon_test_all_nullable_types_get_a_nullable_bool
@@ -717,6 +758,17 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_object_list(
 FlValue* core_tests_pigeon_test_all_nullable_types_get_list_list(
     CoreTestsPigeonTestAllNullableTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_get_map_list
+ * @object: a #CoreTestsPigeonTestAllNullableTypes.
+ *
+ * Gets the value of the mapList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_nullable_types_get_map_list(
+    CoreTestsPigeonTestAllNullableTypes* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_get_recursive_class_list
  * @object: a #CoreTestsPigeonTestAllNullableTypes.
@@ -783,6 +835,28 @@ FlValue* core_tests_pigeon_test_all_nullable_types_get_enum_map(
 FlValue* core_tests_pigeon_test_all_nullable_types_get_object_map(
     CoreTestsPigeonTestAllNullableTypes* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_get_list_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypes.
+ *
+ * Gets the value of the listMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_nullable_types_get_list_map(
+    CoreTestsPigeonTestAllNullableTypes* object);
+
+/**
+ * core_tests_pigeon_test_all_nullable_types_get_map_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypes.
+ *
+ * Gets the value of the mapMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue* core_tests_pigeon_test_all_nullable_types_get_map_map(
+    CoreTestsPigeonTestAllNullableTypes* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_get_recursive_class_map
  * @object: a #CoreTestsPigeonTestAllNullableTypes.
@@ -833,11 +907,14 @@ G_DECLARE_FINAL_TYPE(
  * enum_list: field in this object.
  * object_list: field in this object.
  * list_list: field in this object.
+ * map_list: field in this object.
  * map: field in this object.
  * string_map: field in this object.
  * int_map: field in this object.
  * enum_map: field in this object.
  * object_map: field in this object.
+ * list_map: field in this object.
+ * map_map: field in this object.
  *
  * Creates a new #AllNullableTypesWithoutRecursion object.
  *
@@ -856,8 +933,9 @@ core_tests_pigeon_test_all_nullable_types_without_recursion_new(
     const gchar* a_nullable_string, FlValue* a_nullable_object, FlValue* list,
     FlValue* string_list, FlValue* int_list, FlValue* double_list,
     FlValue* bool_list, FlValue* enum_list, FlValue* object_list,
-    FlValue* list_list, FlValue* map, FlValue* string_map, FlValue* int_map,
-    FlValue* enum_map, FlValue* object_map);
+    FlValue* list_list, FlValue* map_list, FlValue* map, FlValue* string_map,
+    FlValue* int_map, FlValue* enum_map, FlValue* object_map, FlValue* list_map,
+    FlValue* map_map);
 
 /**
  * core_tests_pigeon_test_all_nullable_types_without_recursion_get_a_nullable_bool
@@ -1106,6 +1184,18 @@ FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_list(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_list
+ * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
+ *
+ * Gets the value of the mapList field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_list(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
+
 /**
  * core_tests_pigeon_test_all_nullable_types_without_recursion_get_map
  * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
@@ -1165,6 +1255,30 @@ FlValue*
 core_tests_pigeon_test_all_nullable_types_without_recursion_get_object_map(
     CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
 
+/**
+ * core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
+ *
+ * Gets the value of the listMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_list_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
+
+/**
+ * core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_map
+ * @object: a #CoreTestsPigeonTestAllNullableTypesWithoutRecursion.
+ *
+ * Gets the value of the mapMap field of @object.
+ *
+ * Returns: the field value.
+ */
+FlValue*
+core_tests_pigeon_test_all_nullable_types_without_recursion_get_map_map(
+    CoreTestsPigeonTestAllNullableTypesWithoutRecursion* object);
+
 /**
  * CoreTestsPigeonTestAllClassesWrapper:
  *
diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
index 0101cd8c075..2b2001d6aa4 100644
--- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
+++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
@@ -129,11 +129,14 @@ struct AllTypes {
   var enumList: [AnEnum]
   var objectList: [Any]
   var listList: [[Any?]]
+  var mapList: [[AnyHashable?: Any?]]
   var map: [AnyHashable?: Any?]
   var stringMap: [String: String]
   var intMap: [Int64: Int64]
   var enumMap: [AnEnum: AnEnum]
   var objectMap: [AnyHashable: Any]
+  var listMap: [Int64: [Any?]]
+  var mapMap: [Int64: [AnyHashable?: Any?]]
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllTypes? {
@@ -157,11 +160,14 @@ struct AllTypes {
     let enumList = pigeonVar_list[17] as! [AnEnum]
     let objectList = pigeonVar_list[18] as! [Any]
     let listList = pigeonVar_list[19] as! [[Any?]]
-    let map = pigeonVar_list[20] as! [AnyHashable?: Any?]
-    let stringMap = pigeonVar_list[21] as! [String: String]
-    let intMap = pigeonVar_list[22] as! [Int64: Int64]
-    let enumMap = pigeonVar_list[23] as? [AnEnum: AnEnum]
-    let objectMap = pigeonVar_list[24] as! [AnyHashable: Any]
+    let mapList = pigeonVar_list[20] as! [[AnyHashable?: Any?]]
+    let map = pigeonVar_list[21] as! [AnyHashable?: Any?]
+    let stringMap = pigeonVar_list[22] as! [String: String]
+    let intMap = pigeonVar_list[23] as! [Int64: Int64]
+    let enumMap = pigeonVar_list[24] as? [AnEnum: AnEnum]
+    let objectMap = pigeonVar_list[25] as! [AnyHashable: Any]
+    let listMap = pigeonVar_list[26] as! [Int64: [Any?]]
+    let mapMap = pigeonVar_list[27] as! [Int64: [AnyHashable?: Any?]]
 
     return AllTypes(
       aBool: aBool,
@@ -184,11 +190,14 @@ struct AllTypes {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap!,
-      objectMap: objectMap
+      objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap
     )
   }
   func toList() -> [Any?] {
@@ -213,11 +222,14 @@ struct AllTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ]
   }
 }
@@ -248,12 +260,15 @@ class AllNullableTypes {
     enumList: [AnEnum?]? = nil,
     objectList: [Any?]? = nil,
     listList: [[Any?]?]? = nil,
+    mapList: [[AnyHashable?: Any?]?]? = nil,
     recursiveClassList: [AllNullableTypes?]? = nil,
     map: [AnyHashable?: Any?]? = nil,
     stringMap: [String?: String?]? = nil,
     intMap: [Int64?: Int64?]? = nil,
     enumMap: [AnEnum?: AnEnum?]? = nil,
     objectMap: [AnyHashable?: Any?]? = nil,
+    listMap: [Int64?: [Any?]?]? = nil,
+    mapMap: [Int64?: [AnyHashable?: Any?]?]? = nil,
     recursiveClassMap: [Int64?: AllNullableTypes?]? = nil
   ) {
     self.aNullableBool = aNullableBool
@@ -277,12 +292,15 @@ class AllNullableTypes {
     self.enumList = enumList
     self.objectList = objectList
     self.listList = listList
+    self.mapList = mapList
     self.recursiveClassList = recursiveClassList
     self.map = map
     self.stringMap = stringMap
     self.intMap = intMap
     self.enumMap = enumMap
     self.objectMap = objectMap
+    self.listMap = listMap
+    self.mapMap = mapMap
     self.recursiveClassMap = recursiveClassMap
   }
   var aNullableBool: Bool?
@@ -306,12 +324,15 @@ class AllNullableTypes {
   var enumList: [AnEnum?]?
   var objectList: [Any?]?
   var listList: [[Any?]?]?
+  var mapList: [[AnyHashable?: Any?]?]?
   var recursiveClassList: [AllNullableTypes?]?
   var map: [AnyHashable?: Any?]?
   var stringMap: [String?: String?]?
   var intMap: [Int64?: Int64?]?
   var enumMap: [AnEnum?: AnEnum?]?
   var objectMap: [AnyHashable?: Any?]?
+  var listMap: [Int64?: [Any?]?]?
+  var mapMap: [Int64?: [AnyHashable?: Any?]?]?
   var recursiveClassMap: [Int64?: AllNullableTypes?]?
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -337,13 +358,16 @@ class AllNullableTypes {
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[18])
     let objectList: [Any?]? = nilOrValue(pigeonVar_list[19])
     let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[20])
-    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[21])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[22])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[23])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[24])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[25] as? [AnEnum?: AnEnum?]
-    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[26])
-    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[27])
+    let mapList: [[AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[21])
+    let recursiveClassList: [AllNullableTypes?]? = nilOrValue(pigeonVar_list[22])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[23])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[24])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[25])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[26] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[27])
+    let listMap: [Int64?: [Any?]?]? = nilOrValue(pigeonVar_list[28])
+    let mapMap: [Int64?: [AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[29])
+    let recursiveClassMap: [Int64?: AllNullableTypes?]? = nilOrValue(pigeonVar_list[30])
 
     return AllNullableTypes(
       aNullableBool: aNullableBool,
@@ -367,12 +391,15 @@ class AllNullableTypes {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       recursiveClassList: recursiveClassList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
       objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap,
       recursiveClassMap: recursiveClassMap
     )
   }
@@ -399,12 +426,15 @@ class AllNullableTypes {
       enumList,
       objectList,
       listList,
+      mapList,
       recursiveClassList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
       recursiveClassMap,
     ]
   }
@@ -436,11 +466,14 @@ struct AllNullableTypesWithoutRecursion {
   var enumList: [AnEnum?]? = nil
   var objectList: [Any?]? = nil
   var listList: [[Any?]?]? = nil
+  var mapList: [[AnyHashable?: Any?]?]? = nil
   var map: [AnyHashable?: Any?]? = nil
   var stringMap: [String?: String?]? = nil
   var intMap: [Int64?: Int64?]? = nil
   var enumMap: [AnEnum?: AnEnum?]? = nil
   var objectMap: [AnyHashable?: Any?]? = nil
+  var listMap: [Int64?: [Any?]?]? = nil
+  var mapMap: [Int64?: [AnyHashable?: Any?]?]? = nil
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AllNullableTypesWithoutRecursion? {
@@ -464,11 +497,14 @@ struct AllNullableTypesWithoutRecursion {
     let enumList: [AnEnum?]? = nilOrValue(pigeonVar_list[17])
     let objectList: [Any?]? = nilOrValue(pigeonVar_list[18])
     let listList: [[Any?]?]? = nilOrValue(pigeonVar_list[19])
-    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[20])
-    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[21])
-    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[22])
-    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[23] as? [AnEnum?: AnEnum?]
-    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[24])
+    let mapList: [[AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[20])
+    let map: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[21])
+    let stringMap: [String?: String?]? = nilOrValue(pigeonVar_list[22])
+    let intMap: [Int64?: Int64?]? = nilOrValue(pigeonVar_list[23])
+    let enumMap: [AnEnum?: AnEnum?]? = pigeonVar_list[24] as? [AnEnum?: AnEnum?]
+    let objectMap: [AnyHashable?: Any?]? = nilOrValue(pigeonVar_list[25])
+    let listMap: [Int64?: [Any?]?]? = nilOrValue(pigeonVar_list[26])
+    let mapMap: [Int64?: [AnyHashable?: Any?]?]? = nilOrValue(pigeonVar_list[27])
 
     return AllNullableTypesWithoutRecursion(
       aNullableBool: aNullableBool,
@@ -491,11 +527,14 @@ struct AllNullableTypesWithoutRecursion {
       enumList: enumList,
       objectList: objectList,
       listList: listList,
+      mapList: mapList,
       map: map,
       stringMap: stringMap,
       intMap: intMap,
       enumMap: enumMap,
-      objectMap: objectMap
+      objectMap: objectMap,
+      listMap: listMap,
+      mapMap: mapMap
     )
   }
   func toList() -> [Any?] {
@@ -520,11 +559,14 @@ struct AllNullableTypesWithoutRecursion {
       enumList,
       objectList,
       listList,
+      mapList,
       map,
       stringMap,
       intMap,
       enumMap,
       objectMap,
+      listMap,
+      mapMap,
     ]
   }
 }
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
index c6f293b3d07..c47e3a16e2e 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
+++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp
@@ -84,9 +84,11 @@ AllTypes::AllTypes(bool a_bool, int64_t an_int, int64_t an_int64,
                    const EncodableList& bool_list,
                    const EncodableList& enum_list,
                    const EncodableList& object_list,
-                   const EncodableList& list_list, const EncodableMap& map,
+                   const EncodableList& list_list,
+                   const EncodableList& map_list, const EncodableMap& map,
                    const EncodableMap& string_map, const EncodableMap& int_map,
-                   const EncodableMap& enum_map, const EncodableMap& object_map)
+                   const EncodableMap& enum_map, const EncodableMap& object_map,
+                   const EncodableMap& list_map, const EncodableMap& map_map)
     : a_bool_(a_bool),
       an_int_(an_int),
       an_int64_(an_int64),
@@ -107,11 +109,14 @@ AllTypes::AllTypes(bool a_bool, int64_t an_int, int64_t an_int64,
       enum_list_(enum_list),
       object_list_(object_list),
       list_list_(list_list),
+      map_list_(map_list),
       map_(map),
       string_map_(string_map),
       int_map_(int_map),
       enum_map_(enum_map),
-      object_map_(object_map) {}
+      object_map_(object_map),
+      list_map_(list_map),
+      map_map_(map_map) {}
 
 bool AllTypes::a_bool() const { return a_bool_; }
 
@@ -229,6 +234,12 @@ void AllTypes::set_list_list(const EncodableList& value_arg) {
   list_list_ = value_arg;
 }
 
+const EncodableList& AllTypes::map_list() const { return map_list_; }
+
+void AllTypes::set_map_list(const EncodableList& value_arg) {
+  map_list_ = value_arg;
+}
+
 const EncodableMap& AllTypes::map() const { return map_; }
 
 void AllTypes::set_map(const EncodableMap& value_arg) { map_ = value_arg; }
@@ -257,9 +268,21 @@ void AllTypes::set_object_map(const EncodableMap& value_arg) {
   object_map_ = value_arg;
 }
 
+const EncodableMap& AllTypes::list_map() const { return list_map_; }
+
+void AllTypes::set_list_map(const EncodableMap& value_arg) {
+  list_map_ = value_arg;
+}
+
+const EncodableMap& AllTypes::map_map() const { return map_map_; }
+
+void AllTypes::set_map_map(const EncodableMap& value_arg) {
+  map_map_ = value_arg;
+}
+
 EncodableList AllTypes::ToEncodableList() const {
   EncodableList list;
-  list.reserve(25);
+  list.reserve(28);
   list.push_back(EncodableValue(a_bool_));
   list.push_back(EncodableValue(an_int_));
   list.push_back(EncodableValue(an_int64_));
@@ -280,11 +303,14 @@ EncodableList AllTypes::ToEncodableList() const {
   list.push_back(EncodableValue(enum_list_));
   list.push_back(EncodableValue(object_list_));
   list.push_back(EncodableValue(list_list_));
+  list.push_back(EncodableValue(map_list_));
   list.push_back(EncodableValue(map_));
   list.push_back(EncodableValue(string_map_));
   list.push_back(EncodableValue(int_map_));
   list.push_back(EncodableValue(enum_map_));
   list.push_back(EncodableValue(object_map_));
+  list.push_back(EncodableValue(list_map_));
+  list.push_back(EncodableValue(map_map_));
   return list;
 }
 
@@ -304,9 +330,10 @@ AllTypes AllTypes::FromEncodableList(const EncodableList& list) {
       std::get<EncodableList>(list[14]), std::get<EncodableList>(list[15]),
       std::get<EncodableList>(list[16]), std::get<EncodableList>(list[17]),
       std::get<EncodableList>(list[18]), std::get<EncodableList>(list[19]),
-      std::get<EncodableMap>(list[20]), std::get<EncodableMap>(list[21]),
+      std::get<EncodableList>(list[20]), std::get<EncodableMap>(list[21]),
       std::get<EncodableMap>(list[22]), std::get<EncodableMap>(list[23]),
-      std::get<EncodableMap>(list[24]));
+      std::get<EncodableMap>(list[24]), std::get<EncodableMap>(list[25]),
+      std::get<EncodableMap>(list[26]), std::get<EncodableMap>(list[27]));
   return decoded;
 }
 
@@ -328,10 +355,12 @@ AllNullableTypes::AllNullableTypes(
     const EncodableList* string_list, const EncodableList* int_list,
     const EncodableList* double_list, const EncodableList* bool_list,
     const EncodableList* enum_list, const EncodableList* object_list,
-    const EncodableList* list_list, const EncodableList* recursive_class_list,
-    const EncodableMap* map, const EncodableMap* string_map,
-    const EncodableMap* int_map, const EncodableMap* enum_map,
-    const EncodableMap* object_map, const EncodableMap* recursive_class_map)
+    const EncodableList* list_list, const EncodableList* map_list,
+    const EncodableList* recursive_class_list, const EncodableMap* map,
+    const EncodableMap* string_map, const EncodableMap* int_map,
+    const EncodableMap* enum_map, const EncodableMap* object_map,
+    const EncodableMap* list_map, const EncodableMap* map_map,
+    const EncodableMap* recursive_class_map)
     : a_nullable_bool_(a_nullable_bool ? std::optional<bool>(*a_nullable_bool)
                                        : std::nullopt),
       a_nullable_int_(a_nullable_int ? std::optional<int64_t>(*a_nullable_int)
@@ -388,6 +417,8 @@ AllNullableTypes::AllNullableTypes(
                                : std::nullopt),
       list_list_(list_list ? std::optional<EncodableList>(*list_list)
                            : std::nullopt),
+      map_list_(map_list ? std::optional<EncodableList>(*map_list)
+                         : std::nullopt),
       recursive_class_list_(recursive_class_list ? std::optional<EncodableList>(
                                                        *recursive_class_list)
                                                  : std::nullopt),
@@ -399,6 +430,9 @@ AllNullableTypes::AllNullableTypes(
                          : std::nullopt),
       object_map_(object_map ? std::optional<EncodableMap>(*object_map)
                              : std::nullopt),
+      list_map_(list_map ? std::optional<EncodableMap>(*list_map)
+                         : std::nullopt),
+      map_map_(map_map ? std::optional<EncodableMap>(*map_map) : std::nullopt),
       recursive_class_map_(recursive_class_map ? std::optional<EncodableMap>(
                                                      *recursive_class_map)
                                                : std::nullopt) {}
@@ -473,6 +507,8 @@ AllNullableTypes::AllNullableTypes(const AllNullableTypes& other)
       list_list_(other.list_list_
                      ? std::optional<EncodableList>(*other.list_list_)
                      : std::nullopt),
+      map_list_(other.map_list_ ? std::optional<EncodableList>(*other.map_list_)
+                                : std::nullopt),
       recursive_class_list_(
           other.recursive_class_list_
               ? std::optional<EncodableList>(*other.recursive_class_list_)
@@ -489,6 +525,10 @@ AllNullableTypes::AllNullableTypes(const AllNullableTypes& other)
       object_map_(other.object_map_
                       ? std::optional<EncodableMap>(*other.object_map_)
                       : std::nullopt),
+      list_map_(other.list_map_ ? std::optional<EncodableMap>(*other.list_map_)
+                                : std::nullopt),
+      map_map_(other.map_map_ ? std::optional<EncodableMap>(*other.map_map_)
+                              : std::nullopt),
       recursive_class_map_(
           other.recursive_class_map_
               ? std::optional<EncodableMap>(*other.recursive_class_map_)
@@ -519,12 +559,15 @@ AllNullableTypes& AllNullableTypes::operator=(const AllNullableTypes& other) {
   enum_list_ = other.enum_list_;
   object_list_ = other.object_list_;
   list_list_ = other.list_list_;
+  map_list_ = other.map_list_;
   recursive_class_list_ = other.recursive_class_list_;
   map_ = other.map_;
   string_map_ = other.string_map_;
   int_map_ = other.int_map_;
   enum_map_ = other.enum_map_;
   object_map_ = other.object_map_;
+  list_map_ = other.list_map_;
+  map_map_ = other.map_map_;
   recursive_class_map_ = other.recursive_class_map_;
   return *this;
 }
@@ -814,6 +857,19 @@ void AllNullableTypes::set_list_list(const EncodableList& value_arg) {
   list_list_ = value_arg;
 }
 
+const EncodableList* AllNullableTypes::map_list() const {
+  return map_list_ ? &(*map_list_) : nullptr;
+}
+
+void AllNullableTypes::set_map_list(const EncodableList* value_arg) {
+  map_list_ =
+      value_arg ? std::optional<EncodableList>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypes::set_map_list(const EncodableList& value_arg) {
+  map_list_ = value_arg;
+}
+
 const EncodableList* AllNullableTypes::recursive_class_list() const {
   return recursive_class_list_ ? &(*recursive_class_list_) : nullptr;
 }
@@ -892,6 +948,31 @@ void AllNullableTypes::set_object_map(const EncodableMap& value_arg) {
   object_map_ = value_arg;
 }
 
+const EncodableMap* AllNullableTypes::list_map() const {
+  return list_map_ ? &(*list_map_) : nullptr;
+}
+
+void AllNullableTypes::set_list_map(const EncodableMap* value_arg) {
+  list_map_ =
+      value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypes::set_list_map(const EncodableMap& value_arg) {
+  list_map_ = value_arg;
+}
+
+const EncodableMap* AllNullableTypes::map_map() const {
+  return map_map_ ? &(*map_map_) : nullptr;
+}
+
+void AllNullableTypes::set_map_map(const EncodableMap* value_arg) {
+  map_map_ = value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypes::set_map_map(const EncodableMap& value_arg) {
+  map_map_ = value_arg;
+}
+
 const EncodableMap* AllNullableTypes::recursive_class_map() const {
   return recursive_class_map_ ? &(*recursive_class_map_) : nullptr;
 }
@@ -907,7 +988,7 @@ void AllNullableTypes::set_recursive_class_map(const EncodableMap& value_arg) {
 
 EncodableList AllNullableTypes::ToEncodableList() const {
   EncodableList list;
-  list.reserve(28);
+  list.reserve(31);
   list.push_back(a_nullable_bool_ ? EncodableValue(*a_nullable_bool_)
                                   : EncodableValue());
   list.push_back(a_nullable_int_ ? EncodableValue(*a_nullable_int_)
@@ -950,6 +1031,7 @@ EncodableList AllNullableTypes::ToEncodableList() const {
   list.push_back(object_list_ ? EncodableValue(*object_list_)
                               : EncodableValue());
   list.push_back(list_list_ ? EncodableValue(*list_list_) : EncodableValue());
+  list.push_back(map_list_ ? EncodableValue(*map_list_) : EncodableValue());
   list.push_back(recursive_class_list_ ? EncodableValue(*recursive_class_list_)
                                        : EncodableValue());
   list.push_back(map_ ? EncodableValue(*map_) : EncodableValue());
@@ -957,6 +1039,8 @@ EncodableList AllNullableTypes::ToEncodableList() const {
   list.push_back(int_map_ ? EncodableValue(*int_map_) : EncodableValue());
   list.push_back(enum_map_ ? EncodableValue(*enum_map_) : EncodableValue());
   list.push_back(object_map_ ? EncodableValue(*object_map_) : EncodableValue());
+  list.push_back(list_map_ ? EncodableValue(*list_map_) : EncodableValue());
+  list.push_back(map_map_ ? EncodableValue(*map_map_) : EncodableValue());
   list.push_back(recursive_class_map_ ? EncodableValue(*recursive_class_map_)
                                       : EncodableValue());
   return list;
@@ -1058,32 +1142,44 @@ AllNullableTypes AllNullableTypes::FromEncodableList(
   if (!encodable_list_list.IsNull()) {
     decoded.set_list_list(std::get<EncodableList>(encodable_list_list));
   }
-  auto& encodable_recursive_class_list = list[21];
+  auto& encodable_map_list = list[21];
+  if (!encodable_map_list.IsNull()) {
+    decoded.set_map_list(std::get<EncodableList>(encodable_map_list));
+  }
+  auto& encodable_recursive_class_list = list[22];
   if (!encodable_recursive_class_list.IsNull()) {
     decoded.set_recursive_class_list(
         std::get<EncodableList>(encodable_recursive_class_list));
   }
-  auto& encodable_map = list[22];
+  auto& encodable_map = list[23];
   if (!encodable_map.IsNull()) {
     decoded.set_map(std::get<EncodableMap>(encodable_map));
   }
-  auto& encodable_string_map = list[23];
+  auto& encodable_string_map = list[24];
   if (!encodable_string_map.IsNull()) {
     decoded.set_string_map(std::get<EncodableMap>(encodable_string_map));
   }
-  auto& encodable_int_map = list[24];
+  auto& encodable_int_map = list[25];
   if (!encodable_int_map.IsNull()) {
     decoded.set_int_map(std::get<EncodableMap>(encodable_int_map));
   }
-  auto& encodable_enum_map = list[25];
+  auto& encodable_enum_map = list[26];
   if (!encodable_enum_map.IsNull()) {
     decoded.set_enum_map(std::get<EncodableMap>(encodable_enum_map));
   }
-  auto& encodable_object_map = list[26];
+  auto& encodable_object_map = list[27];
   if (!encodable_object_map.IsNull()) {
     decoded.set_object_map(std::get<EncodableMap>(encodable_object_map));
   }
-  auto& encodable_recursive_class_map = list[27];
+  auto& encodable_list_map = list[28];
+  if (!encodable_list_map.IsNull()) {
+    decoded.set_list_map(std::get<EncodableMap>(encodable_list_map));
+  }
+  auto& encodable_map_map = list[29];
+  if (!encodable_map_map.IsNull()) {
+    decoded.set_map_map(std::get<EncodableMap>(encodable_map_map));
+  }
+  auto& encodable_recursive_class_map = list[30];
   if (!encodable_recursive_class_map.IsNull()) {
     decoded.set_recursive_class_map(
         std::get<EncodableMap>(encodable_recursive_class_map));
@@ -1108,9 +1204,11 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
     const EncodableList* string_list, const EncodableList* int_list,
     const EncodableList* double_list, const EncodableList* bool_list,
     const EncodableList* enum_list, const EncodableList* object_list,
-    const EncodableList* list_list, const EncodableMap* map,
-    const EncodableMap* string_map, const EncodableMap* int_map,
-    const EncodableMap* enum_map, const EncodableMap* object_map)
+    const EncodableList* list_list, const EncodableList* map_list,
+    const EncodableMap* map, const EncodableMap* string_map,
+    const EncodableMap* int_map, const EncodableMap* enum_map,
+    const EncodableMap* object_map, const EncodableMap* list_map,
+    const EncodableMap* map_map)
     : a_nullable_bool_(a_nullable_bool ? std::optional<bool>(*a_nullable_bool)
                                        : std::nullopt),
       a_nullable_int_(a_nullable_int ? std::optional<int64_t>(*a_nullable_int)
@@ -1163,6 +1261,8 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
                                : std::nullopt),
       list_list_(list_list ? std::optional<EncodableList>(*list_list)
                            : std::nullopt),
+      map_list_(map_list ? std::optional<EncodableList>(*map_list)
+                         : std::nullopt),
       map_(map ? std::optional<EncodableMap>(*map) : std::nullopt),
       string_map_(string_map ? std::optional<EncodableMap>(*string_map)
                              : std::nullopt),
@@ -1170,7 +1270,11 @@ AllNullableTypesWithoutRecursion::AllNullableTypesWithoutRecursion(
       enum_map_(enum_map ? std::optional<EncodableMap>(*enum_map)
                          : std::nullopt),
       object_map_(object_map ? std::optional<EncodableMap>(*object_map)
-                             : std::nullopt) {}
+                             : std::nullopt),
+      list_map_(list_map ? std::optional<EncodableMap>(*list_map)
+                         : std::nullopt),
+      map_map_(map_map ? std::optional<EncodableMap>(*map_map) : std::nullopt) {
+}
 
 const bool* AllNullableTypesWithoutRecursion::a_nullable_bool() const {
   return a_nullable_bool_ ? &(*a_nullable_bool_) : nullptr;
@@ -1475,6 +1579,21 @@ void AllNullableTypesWithoutRecursion::set_list_list(
   list_list_ = value_arg;
 }
 
+const EncodableList* AllNullableTypesWithoutRecursion::map_list() const {
+  return map_list_ ? &(*map_list_) : nullptr;
+}
+
+void AllNullableTypesWithoutRecursion::set_map_list(
+    const EncodableList* value_arg) {
+  map_list_ =
+      value_arg ? std::optional<EncodableList>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypesWithoutRecursion::set_map_list(
+    const EncodableList& value_arg) {
+  map_list_ = value_arg;
+}
+
 const EncodableMap* AllNullableTypesWithoutRecursion::map() const {
   return map_ ? &(*map_) : nullptr;
 }
@@ -1546,9 +1665,38 @@ void AllNullableTypesWithoutRecursion::set_object_map(
   object_map_ = value_arg;
 }
 
+const EncodableMap* AllNullableTypesWithoutRecursion::list_map() const {
+  return list_map_ ? &(*list_map_) : nullptr;
+}
+
+void AllNullableTypesWithoutRecursion::set_list_map(
+    const EncodableMap* value_arg) {
+  list_map_ =
+      value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypesWithoutRecursion::set_list_map(
+    const EncodableMap& value_arg) {
+  list_map_ = value_arg;
+}
+
+const EncodableMap* AllNullableTypesWithoutRecursion::map_map() const {
+  return map_map_ ? &(*map_map_) : nullptr;
+}
+
+void AllNullableTypesWithoutRecursion::set_map_map(
+    const EncodableMap* value_arg) {
+  map_map_ = value_arg ? std::optional<EncodableMap>(*value_arg) : std::nullopt;
+}
+
+void AllNullableTypesWithoutRecursion::set_map_map(
+    const EncodableMap& value_arg) {
+  map_map_ = value_arg;
+}
+
 EncodableList AllNullableTypesWithoutRecursion::ToEncodableList() const {
   EncodableList list;
-  list.reserve(25);
+  list.reserve(28);
   list.push_back(a_nullable_bool_ ? EncodableValue(*a_nullable_bool_)
                                   : EncodableValue());
   list.push_back(a_nullable_int_ ? EncodableValue(*a_nullable_int_)
@@ -1588,11 +1736,14 @@ EncodableList AllNullableTypesWithoutRecursion::ToEncodableList() const {
   list.push_back(object_list_ ? EncodableValue(*object_list_)
                               : EncodableValue());
   list.push_back(list_list_ ? EncodableValue(*list_list_) : EncodableValue());
+  list.push_back(map_list_ ? EncodableValue(*map_list_) : EncodableValue());
   list.push_back(map_ ? EncodableValue(*map_) : EncodableValue());
   list.push_back(string_map_ ? EncodableValue(*string_map_) : EncodableValue());
   list.push_back(int_map_ ? EncodableValue(*int_map_) : EncodableValue());
   list.push_back(enum_map_ ? EncodableValue(*enum_map_) : EncodableValue());
   list.push_back(object_map_ ? EncodableValue(*object_map_) : EncodableValue());
+  list.push_back(list_map_ ? EncodableValue(*list_map_) : EncodableValue());
+  list.push_back(map_map_ ? EncodableValue(*map_map_) : EncodableValue());
   return list;
 }
 
@@ -1687,26 +1838,38 @@ AllNullableTypesWithoutRecursion::FromEncodableList(const EncodableList& list) {
   if (!encodable_list_list.IsNull()) {
     decoded.set_list_list(std::get<EncodableList>(encodable_list_list));
   }
-  auto& encodable_map = list[20];
+  auto& encodable_map_list = list[20];
+  if (!encodable_map_list.IsNull()) {
+    decoded.set_map_list(std::get<EncodableList>(encodable_map_list));
+  }
+  auto& encodable_map = list[21];
   if (!encodable_map.IsNull()) {
     decoded.set_map(std::get<EncodableMap>(encodable_map));
   }
-  auto& encodable_string_map = list[21];
+  auto& encodable_string_map = list[22];
   if (!encodable_string_map.IsNull()) {
     decoded.set_string_map(std::get<EncodableMap>(encodable_string_map));
   }
-  auto& encodable_int_map = list[22];
+  auto& encodable_int_map = list[23];
   if (!encodable_int_map.IsNull()) {
     decoded.set_int_map(std::get<EncodableMap>(encodable_int_map));
   }
-  auto& encodable_enum_map = list[23];
+  auto& encodable_enum_map = list[24];
   if (!encodable_enum_map.IsNull()) {
     decoded.set_enum_map(std::get<EncodableMap>(encodable_enum_map));
   }
-  auto& encodable_object_map = list[24];
+  auto& encodable_object_map = list[25];
   if (!encodable_object_map.IsNull()) {
     decoded.set_object_map(std::get<EncodableMap>(encodable_object_map));
   }
+  auto& encodable_list_map = list[26];
+  if (!encodable_list_map.IsNull()) {
+    decoded.set_list_map(std::get<EncodableMap>(encodable_list_map));
+  }
+  auto& encodable_map_map = list[27];
+  if (!encodable_map_map.IsNull()) {
+    decoded.set_map_map(std::get<EncodableMap>(encodable_map_map));
+  }
   return decoded;
 }
 
diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
index a73e01e439a..7f19e1a19cb 100644
--- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
+++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h
@@ -123,11 +123,14 @@ class AllTypes {
                     const flutter::EncodableList& enum_list,
                     const flutter::EncodableList& object_list,
                     const flutter::EncodableList& list_list,
+                    const flutter::EncodableList& map_list,
                     const flutter::EncodableMap& map,
                     const flutter::EncodableMap& string_map,
                     const flutter::EncodableMap& int_map,
                     const flutter::EncodableMap& enum_map,
-                    const flutter::EncodableMap& object_map);
+                    const flutter::EncodableMap& object_map,
+                    const flutter::EncodableMap& list_map,
+                    const flutter::EncodableMap& map_map);
 
   bool a_bool() const;
   void set_a_bool(bool value_arg);
@@ -189,6 +192,9 @@ class AllTypes {
   const flutter::EncodableList& list_list() const;
   void set_list_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList& map_list() const;
+  void set_map_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableMap& map() const;
   void set_map(const flutter::EncodableMap& value_arg);
 
@@ -204,6 +210,12 @@ class AllTypes {
   const flutter::EncodableMap& object_map() const;
   void set_object_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap& list_map() const;
+  void set_list_map(const flutter::EncodableMap& value_arg);
+
+  const flutter::EncodableMap& map_map() const;
+  void set_map_map(const flutter::EncodableMap& value_arg);
+
  private:
   static AllTypes FromEncodableList(const flutter::EncodableList& list);
   flutter::EncodableList ToEncodableList() const;
@@ -235,11 +247,14 @@ class AllTypes {
   flutter::EncodableList enum_list_;
   flutter::EncodableList object_list_;
   flutter::EncodableList list_list_;
+  flutter::EncodableList map_list_;
   flutter::EncodableMap map_;
   flutter::EncodableMap string_map_;
   flutter::EncodableMap int_map_;
   flutter::EncodableMap enum_map_;
   flutter::EncodableMap object_map_;
+  flutter::EncodableMap list_map_;
+  flutter::EncodableMap map_map_;
 };
 
 // A class containing all supported nullable types.
@@ -270,11 +285,14 @@ class AllNullableTypes {
       const flutter::EncodableList* enum_list,
       const flutter::EncodableList* object_list,
       const flutter::EncodableList* list_list,
+      const flutter::EncodableList* map_list,
       const flutter::EncodableList* recursive_class_list,
       const flutter::EncodableMap* map, const flutter::EncodableMap* string_map,
       const flutter::EncodableMap* int_map,
       const flutter::EncodableMap* enum_map,
       const flutter::EncodableMap* object_map,
+      const flutter::EncodableMap* list_map,
+      const flutter::EncodableMap* map_map,
       const flutter::EncodableMap* recursive_class_map);
 
   ~AllNullableTypes() = default;
@@ -366,6 +384,10 @@ class AllNullableTypes {
   void set_list_list(const flutter::EncodableList* value_arg);
   void set_list_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList* map_list() const;
+  void set_map_list(const flutter::EncodableList* value_arg);
+  void set_map_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableList* recursive_class_list() const;
   void set_recursive_class_list(const flutter::EncodableList* value_arg);
   void set_recursive_class_list(const flutter::EncodableList& value_arg);
@@ -390,6 +412,14 @@ class AllNullableTypes {
   void set_object_map(const flutter::EncodableMap* value_arg);
   void set_object_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap* list_map() const;
+  void set_list_map(const flutter::EncodableMap* value_arg);
+  void set_list_map(const flutter::EncodableMap& value_arg);
+
+  const flutter::EncodableMap* map_map() const;
+  void set_map_map(const flutter::EncodableMap* value_arg);
+  void set_map_map(const flutter::EncodableMap& value_arg);
+
   const flutter::EncodableMap* recursive_class_map() const;
   void set_recursive_class_map(const flutter::EncodableMap* value_arg);
   void set_recursive_class_map(const flutter::EncodableMap& value_arg);
@@ -426,12 +456,15 @@ class AllNullableTypes {
   std::optional<flutter::EncodableList> enum_list_;
   std::optional<flutter::EncodableList> object_list_;
   std::optional<flutter::EncodableList> list_list_;
+  std::optional<flutter::EncodableList> map_list_;
   std::optional<flutter::EncodableList> recursive_class_list_;
   std::optional<flutter::EncodableMap> map_;
   std::optional<flutter::EncodableMap> string_map_;
   std::optional<flutter::EncodableMap> int_map_;
   std::optional<flutter::EncodableMap> enum_map_;
   std::optional<flutter::EncodableMap> object_map_;
+  std::optional<flutter::EncodableMap> list_map_;
+  std::optional<flutter::EncodableMap> map_map_;
   std::optional<flutter::EncodableMap> recursive_class_map_;
 };
 
@@ -463,11 +496,14 @@ class AllNullableTypesWithoutRecursion {
       const flutter::EncodableList* bool_list,
       const flutter::EncodableList* enum_list,
       const flutter::EncodableList* object_list,
-      const flutter::EncodableList* list_list, const flutter::EncodableMap* map,
+      const flutter::EncodableList* list_list,
+      const flutter::EncodableList* map_list, const flutter::EncodableMap* map,
       const flutter::EncodableMap* string_map,
       const flutter::EncodableMap* int_map,
       const flutter::EncodableMap* enum_map,
-      const flutter::EncodableMap* object_map);
+      const flutter::EncodableMap* object_map,
+      const flutter::EncodableMap* list_map,
+      const flutter::EncodableMap* map_map);
 
   const bool* a_nullable_bool() const;
   void set_a_nullable_bool(const bool* value_arg);
@@ -549,6 +585,10 @@ class AllNullableTypesWithoutRecursion {
   void set_list_list(const flutter::EncodableList* value_arg);
   void set_list_list(const flutter::EncodableList& value_arg);
 
+  const flutter::EncodableList* map_list() const;
+  void set_map_list(const flutter::EncodableList* value_arg);
+  void set_map_list(const flutter::EncodableList& value_arg);
+
   const flutter::EncodableMap* map() const;
   void set_map(const flutter::EncodableMap* value_arg);
   void set_map(const flutter::EncodableMap& value_arg);
@@ -569,6 +609,14 @@ class AllNullableTypesWithoutRecursion {
   void set_object_map(const flutter::EncodableMap* value_arg);
   void set_object_map(const flutter::EncodableMap& value_arg);
 
+  const flutter::EncodableMap* list_map() const;
+  void set_list_map(const flutter::EncodableMap* value_arg);
+  void set_list_map(const flutter::EncodableMap& value_arg);
+
+  const flutter::EncodableMap* map_map() const;
+  void set_map_map(const flutter::EncodableMap* value_arg);
+  void set_map_map(const flutter::EncodableMap& value_arg);
+
  private:
   static AllNullableTypesWithoutRecursion FromEncodableList(
       const flutter::EncodableList& list);
@@ -601,11 +649,14 @@ class AllNullableTypesWithoutRecursion {
   std::optional<flutter::EncodableList> enum_list_;
   std::optional<flutter::EncodableList> object_list_;
   std::optional<flutter::EncodableList> list_list_;
+  std::optional<flutter::EncodableList> map_list_;
   std::optional<flutter::EncodableMap> map_;
   std::optional<flutter::EncodableMap> string_map_;
   std::optional<flutter::EncodableMap> int_map_;
   std::optional<flutter::EncodableMap> enum_map_;
   std::optional<flutter::EncodableMap> object_map_;
+  std::optional<flutter::EncodableMap> list_map_;
+  std::optional<flutter::EncodableMap> map_map_;
 };
 
 // A class for testing nested class handling.

From cf4c27cd6bc4f6268eb0329be73a84af4b68847b Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Mon, 9 Sep 2024 18:23:01 -0700
Subject: [PATCH 3/8] fix class checks

---
 .../lib/test_types.dart                       | 125 ++++++++++--------
 1 file changed, 68 insertions(+), 57 deletions(-)

diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
index 9e7c18fcd68..245dee870cb 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
@@ -54,18 +54,24 @@ void compareAllNullableTypesWithoutRecursion(
       true);
   expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
       true);
-  // expect(
-  //     listEquals(
-  //         allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
-  //     true);
+  expect(
+      listEquals(
+          allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
+      true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
-  //for (int i = 0; i < allNullableTypesOne.listList!.length; i++) {
-  //  expect(listEquals(allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
-  //      true);
-  //}
-  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
-  //     true);
+  for (int i = 0; i < (allNullableTypesOne.listList?.length ?? 0); i++) {
+    expect(
+        listEquals(
+            allNullableTypesOne.listList?[i], allNullableTypesTwo.listList?[i]),
+        true);
+  }
+  for (int i = 0; i < (allNullableTypesOne.mapList?.length ?? 0); i++) {
+    expect(
+        mapEquals(
+            allNullableTypesOne.mapList?[i], allNullableTypesTwo.mapList?[i]),
+        true);
+  }
   expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
   expect(
       mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
@@ -77,11 +83,12 @@ void compareAllNullableTypesWithoutRecursion(
   //     true);
   // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
   //     true);
-  // expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-  //     true);
-  // expect(
-  //     mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
-  // true);
+  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
+      true);
+  expect(
+      mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
+      true);
+
   // listMap: check each key and value, and compare each lists values
   //
   // mapMap: check each key and value, and compare each map in the same way
@@ -109,21 +116,22 @@ void compareAllTypes(AllTypes? allTypesOne, AllTypes? allTypesTwo) {
   expect(listEquals(allTypesOne.doubleList, allTypesTwo.doubleList), true);
   expect(listEquals(allTypesOne.boolList, allTypesTwo.boolList), true);
   expect(listEquals(allTypesOne.enumList, allTypesTwo.enumList), true);
-  // expect(listEquals(allTypesOne.objectList, allTypesTwo.objectList), true);
+  expect(listEquals(allTypesOne.objectList, allTypesTwo.objectList), true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
-  //for (int i = 0; i < allTypesOne.listList!.length; i++) {
-  //  expect(listEquals(allTypesOne.listList![i], allTypesTwo.listList![i]),
-  //      true);
-  //}
-  // expect(listEquals(allTypesOne.mapList, allTypesTwo.mapList), true);
+  for (int i = 0; i < allTypesOne.listList.length; i++) {
+    expect(listEquals(allTypesOne.listList[i], allTypesTwo.listList[i]), true);
+  }
+  for (int i = 0; i < allTypesOne.mapList.length; i++) {
+    expect(mapEquals(allTypesOne.mapList[i], allTypesTwo.mapList[i]), true);
+  }
   expect(mapEquals(allTypesOne.map, allTypesTwo.map), true);
   expect(mapEquals(allTypesOne.stringMap, allTypesTwo.stringMap), true);
   expect(mapEquals(allTypesOne.intMap, allTypesTwo.intMap), true);
   // expect(mapEquals(allTypesOne.doubleMap, allTypesTwo.doubleMap), true);
   // expect(mapEquals(allTypesOne.boolMap, allTypesTwo.boolMap), true);
   expect(mapEquals(allTypesOne.enumMap, allTypesTwo.enumMap), true);
-  // expect(mapEquals(allTypesOne.objectMap, allTypesTwo.objectMap), true);
+  expect(mapEquals(allTypesOne.objectMap, allTypesTwo.objectMap), true);
   // listMap: check each key and value, and compare each lists values
   //
   // mapMap: check each key and value, and compare each map in the same way
@@ -171,30 +179,36 @@ void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
       true);
   expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
       true);
-  // expect(
-  //     listEquals(
-  //         allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
-  // true);
+  expect(
+      listEquals(
+          allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
+      true);
   // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
   // https://github.com/flutter/flutter/issues/116117
-  //for (int i = 0; i < allNullableTypesOne.listList!.length; i++) {
-  //  expect(listEquals(allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
-  //      true);
-  //}
-  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
-  //     true);
-  // for (int i = 0; i < (allNullableTypesOne.classList?.length ?? 0); i++) {
-  //   compareAllNullableTypesWithoutRecursion(
-  //       allNullableTypesOne.classList?[i], allNullableTypesTwo.classList?[i]);
-  // }
+  for (int i = 0; i < (allNullableTypesOne.listList?.length ?? 0); i++) {
+    expect(
+        listEquals(
+            allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
+        true);
+  }
+  for (int i = 0; i < (allNullableTypesOne.mapList?.length ?? 0); i++) {
+    expect(
+        mapEquals(
+            allNullableTypesOne.mapList?[i], allNullableTypesTwo.mapList?[i]),
+        true);
+  }
+  for (int i = 0;
+      i < (allNullableTypesOne.recursiveClassList?.length ?? 0);
+      i++) {
+    compareAllNullableTypes(allNullableTypesOne.recursiveClassList?[i],
+        allNullableTypesTwo.recursiveClassList?[i]);
+  }
   for (int i = 0;
       i < (allNullableTypesOne.recursiveClassList?.length ?? 0);
       i++) {
     compareAllNullableTypes(allNullableTypesOne.recursiveClassList?[i],
         allNullableTypesTwo.recursiveClassList?[i]);
   }
-  // expect(listEquals(allNullableTypesOne.mapList, allNullableTypesTwo.mapList),
-  //     true);
   expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
   expect(
       mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
@@ -206,11 +220,11 @@ void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
   //     true);
   // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
   //     true);
-  // expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-  //     true);
-  // expect(
-  //     mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
-  //     true);
+  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
+      true);
+  expect(
+      mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
+      true);
   // listMap: check each key and value, and compare each lists values
   //
   // mapMap: check each key and value, and compare each map in the same way
@@ -233,17 +247,14 @@ void compareAllClassesWrapper(
   );
   compareAllTypes(wrapperOne.allTypes, wrapperTwo.allTypes);
 
-  // for (int i = 0; i < (allTypesOne.classList.length); i++) {
-  //   compareAllTypes(
-  //       allTypesOne.classList[i], allTypesTwo.classList[i]);
-  // }
-  //
-  // classMap: check each key and value, call each compare method for every class
-  //
-  // for (int i = 0; i < (allTypesOne.nullableClassList.length); i++) {
-  //   compareAllNullableTypesWithoutRecursion(
-  //       allTypesOne.nullableClassList[i], allTypesTwo.nullableClassList[i]);
-  // }
+  for (int i = 0; i < (wrapperOne.classList.length); i++) {
+    compareAllTypes(wrapperOne.classList[i], wrapperTwo.classList[i]);
+  }
+
+  for (int i = 0; i < (wrapperOne.nullableClassList?.length ?? 0); i++) {
+    compareAllNullableTypesWithoutRecursion(
+        wrapperOne.nullableClassList![i], wrapperTwo.nullableClassList![i]);
+  }
   //
   // ClassMap: check each key and value, call each compare method for every class
 }
@@ -673,7 +684,7 @@ final AllNullableTypes recursiveAllNullableTypes = AllNullableTypes(
   enumList: enumList,
   objectList: list,
   listList: listList,
-  // mapList: mapList,
+  mapList: mapList,
   recursiveClassList: allNullableTypesList,
   map: map,
   stringMap: stringMap,
@@ -682,8 +693,8 @@ final AllNullableTypes recursiveAllNullableTypes = AllNullableTypes(
   // boolMap: boolMap,
   enumMap: enumMap,
   objectMap: map,
-  // listMap: listMap,
-  // mapMap: mapMap,
+  listMap: listMap,
+  mapMap: mapMap,
   recursiveClassMap: allNullableTypesMap,
 );
 

From 742cfb6af348d5ce635ccc1d9a531d4ee18cd609 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Tue, 10 Sep 2024 11:47:07 -0700
Subject: [PATCH 4/8] vers

---
 packages/pigeon/CHANGELOG.md             | 4 ++++
 packages/pigeon/lib/generator_tools.dart | 2 +-
 packages/pigeon/pubspec.yaml             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index 2ee6f50be5c..30222537400 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 22.5.0
+
+* Adds support for nested collections.
+
 ## 22.4.0
 
 * Adds support for nullable types in collections.
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 1474098aeac..37bce3f6402 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -14,7 +14,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '22.4.0';
+const String pigeonVersion = '22.5.0';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index c2e58e40761..39b0b8854b2 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 22.4.0 # This must match the version in lib/generator_tools.dart
+version: 22.5.0 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ^3.3.0

From ceed8aceaf9e55a77e378d1c34f2f45e4ac8a6f7 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Tue, 10 Sep 2024 11:53:25 -0700
Subject: [PATCH 5/8] fix lunix

---
 .../pigeon/platform_tests/test_plugin/linux/test_plugin.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc b/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
index 9f1ef2fbf49..14938e9980f 100644
--- a/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
+++ b/packages/pigeon/platform_tests/test_plugin/linux/test_plugin.cc
@@ -278,7 +278,7 @@ create_nested_nullable_string(const gchar* nullable_string,
           0, nullptr, 0, nullptr, nullptr, nullable_string, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr);
+          nullptr, nullptr, nullptr, nullptr);
   FlValue* classList = fl_value_new_list();
   FlValue* classMap = fl_value_new_map();
   g_autoptr(CoreTestsPigeonTestAllClassesWrapper) wrapper =
@@ -298,7 +298,8 @@ send_multiple_nullable_types(gboolean* a_nullable_bool, int64_t* a_nullable_int,
           nullptr, 0, nullptr, 0, nullptr, 0, nullptr, nullptr,
           a_nullable_string, nullptr, nullptr, nullptr, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr, nullptr, nullptr, nullptr, nullptr);
+          nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+          nullptr);
   return core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_response_new(
       types);
 }
@@ -314,7 +315,7 @@ send_multiple_nullable_types_without_recursion(gboolean* a_nullable_bool,
           nullptr, 0, nullptr, 0, nullptr, 0, nullptr, nullptr,
           a_nullable_string, nullptr, nullptr, nullptr, nullptr, nullptr,
           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-          nullptr, nullptr);
+          nullptr, nullptr, nullptr, nullptr, nullptr);
   return core_tests_pigeon_test_host_integration_core_api_send_multiple_nullable_types_without_recursion_response_new(
       types);
 }

From 7a5b3a98912d808c0a88ae1dbee20c075746724e Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Wed, 18 Sep 2024 16:54:58 -0700
Subject: [PATCH 6/8] finish tests

---
 packages/pigeon/pigeons/core_tests.dart       |  12 -
 .../lib/test_types.dart                       | 279 +++++++++---------
 2 files changed, 133 insertions(+), 158 deletions(-)

diff --git a/packages/pigeon/pigeons/core_tests.dart b/packages/pigeon/pigeons/core_tests.dart
index 0bdfd40cd1f..a644ce5b3e0 100644
--- a/packages/pigeon/pigeons/core_tests.dart
+++ b/packages/pigeon/pigeons/core_tests.dart
@@ -58,8 +58,6 @@ class AllTypes {
     required this.map,
     required this.stringMap,
     required this.intMap,
-    // required this.doubleMap,
-    // required this.boolMap,
     required this.enumMap,
     required this.objectMap,
     required this.listMap,
@@ -96,8 +94,6 @@ class AllTypes {
   Map map;
   Map<String, String> stringMap;
   Map<int, int> intMap;
-  // Map<double, double> doubleMap;
-  // Map<int, bool> boolMap;
   Map<AnEnum, AnEnum> enumMap;
   Map<Object, Object> objectMap;
   Map<int, List<Object?>> listMap;
@@ -140,8 +136,6 @@ class AllNullableTypes {
     this.map,
     this.stringMap,
     this.intMap,
-    // this.doubleMap,
-    // this.boolMap,
     this.enumMap,
     this.objectMap,
     this.listMap,
@@ -181,8 +175,6 @@ class AllNullableTypes {
   Map? map;
   Map<String?, String?>? stringMap;
   Map<int?, int?>? intMap;
-  // Map<double, double?>? doubleMap;
-  // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
   Map<Object?, Object?>? objectMap;
   Map<int?, List<Object?>?>? listMap;
@@ -225,8 +217,6 @@ class AllNullableTypesWithoutRecursion {
     this.map,
     this.stringMap,
     this.intMap,
-    // this.doubleMap,
-    // this.boolMap,
     this.enumMap,
     this.objectMap,
     this.listMap,
@@ -263,8 +253,6 @@ class AllNullableTypesWithoutRecursion {
   Map? map;
   Map<String?, String?>? stringMap;
   Map<int?, int?>? intMap;
-  // Map<double, double?>? doubleMap;
-  // Map<int, bool?>? boolMap;
   Map<AnEnum?, AnEnum?>? enumMap;
   Map<Object?, Object?>? objectMap;
   Map<int?, List<Object?>?>? listMap;
diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
index 6e9f3582aff..40d35dc6794 100644
--- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
+++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/test_types.dart
@@ -13,6 +13,69 @@ const int biggerThanBigInt = 3000000000;
 const int regularInt = 42;
 const double doublePi = 3.14159;
 
+void compareComplexLists(List<dynamic>? listOne, List<dynamic>? listTwo) {
+  expect(listOne == null, listTwo == null);
+  if (listOne == null || listTwo == null) {
+    return;
+  }
+  expect(listOne.length, listTwo.length);
+  for (int i = 0; i < listOne.length; i++) {
+    if (listOne[i] is List) {
+      compareComplexLists(
+          listOne[i] as List<dynamic>, listTwo[i] as List<dynamic>);
+    } else if (listOne[i] is Map) {
+      compareComplexMaps(listOne[i] as Map<dynamic, dynamic>,
+          listTwo[i] as Map<dynamic, dynamic>);
+    } else if (listOne[i] is AllTypes) {
+      compareAllTypes(listOne[i] as AllTypes, listTwo[i] as AllTypes);
+    } else if (listOne[i] is AllNullableTypes) {
+      compareAllNullableTypes(
+          listOne[i] as AllNullableTypes, listTwo[i] as AllNullableTypes);
+    } else if (listOne[i] is AllNullableTypesWithoutRecursion) {
+      compareAllNullableTypesWithoutRecursion(
+          listOne[i] as AllNullableTypesWithoutRecursion,
+          listTwo[i] as AllNullableTypesWithoutRecursion);
+    } else if (listOne[i] is AllClassesWrapper) {
+      compareAllClassesWrapper(
+          listOne[i] as AllClassesWrapper, listTwo[i] as AllClassesWrapper);
+    } else {
+      expect(listOne[i], listTwo[i]);
+    }
+  }
+}
+
+void compareComplexMaps(
+    Map<dynamic, dynamic>? mapOne, Map<dynamic, dynamic>? mapTwo) {
+  expect(mapOne == null, mapTwo == null);
+  if (mapOne == null || mapTwo == null) {
+    return;
+  }
+  expect(mapOne.length, mapTwo.length);
+  for (final dynamic key in mapOne.keys) {
+    if (mapOne[key] is List) {
+      compareComplexLists(
+          mapOne[key] as List<dynamic>, mapTwo[key] as List<dynamic>);
+    } else if (mapOne[key] is Map) {
+      compareComplexMaps(mapOne[key] as Map<dynamic, dynamic>,
+          mapTwo[key] as Map<dynamic, dynamic>);
+    } else if (mapOne[key] is AllTypes) {
+      compareAllTypes(mapOne[key] as AllTypes, mapTwo[key] as AllTypes);
+    } else if (mapOne[key] is AllNullableTypes) {
+      compareAllNullableTypes(
+          mapOne[key] as AllNullableTypes, mapTwo[key] as AllNullableTypes);
+    } else if (mapOne[key] is AllNullableTypesWithoutRecursion) {
+      compareAllNullableTypesWithoutRecursion(
+          mapOne[key] as AllNullableTypesWithoutRecursion,
+          mapTwo[key] as AllNullableTypesWithoutRecursion);
+    } else if (mapOne[key] is AllClassesWrapper) {
+      compareAllClassesWrapper(
+          mapOne[key] as AllClassesWrapper, mapTwo[key] as AllClassesWrapper);
+    } else {
+      expect(mapOne[key], mapTwo[key]);
+    }
+  }
+}
+
 void compareAllNullableTypesWithoutRecursion(
     AllNullableTypesWithoutRecursion? allNullableTypesOne,
     AllNullableTypesWithoutRecursion? allNullableTypesTwo) {
@@ -39,59 +102,30 @@ void compareAllNullableTypesWithoutRecursion(
   expect(
       allNullableTypesOne.aNullableObject, allNullableTypesTwo.aNullableObject);
   expect(allNullableTypesOne.aNullableEnum, allNullableTypesTwo.aNullableEnum);
-  expect(listEquals(allNullableTypesOne.list, allNullableTypesTwo.list), true);
-  expect(
-      listEquals(
-          allNullableTypesOne.stringList, allNullableTypesTwo.stringList),
-      true);
-  expect(listEquals(allNullableTypesOne.boolList, allNullableTypesTwo.boolList),
-      true);
-  expect(
-      listEquals(
-          allNullableTypesOne.doubleList, allNullableTypesTwo.doubleList),
-      true);
-  expect(listEquals(allNullableTypesOne.intList, allNullableTypesTwo.intList),
-      true);
-  expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
-      true);
-  expect(
-      listEquals(
-          allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
-      true);
-  // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
-  // https://github.com/flutter/flutter/issues/116117
-  for (int i = 0; i < (allNullableTypesOne.listList?.length ?? 0); i++) {
-    expect(
-        listEquals(
-            allNullableTypesOne.listList?[i], allNullableTypesTwo.listList?[i]),
-        true);
-  }
-  for (int i = 0; i < (allNullableTypesOne.mapList?.length ?? 0); i++) {
-    expect(
-        mapEquals(
-            allNullableTypesOne.mapList?[i], allNullableTypesTwo.mapList?[i]),
-        true);
-  }
-  expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
-  expect(
-      mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
-      true);
-  expect(
-      mapEquals(allNullableTypesOne.intMap, allNullableTypesTwo.intMap), true);
-  // expect(
-  //     mapEquals(allNullableTypesOne.doubleMap, allNullableTypesTwo.doubleMap),
-  //     true);
-  // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
-  //     true);
-  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-      true);
-  expect(
-      mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
-      true);
-
-  // listMap: check each key and value, and compare each lists values
-  //
-  // mapMap: check each key and value, and compare each map in the same way
+  compareComplexLists(allNullableTypesOne.list, allNullableTypesTwo.list);
+  compareComplexLists(
+      allNullableTypesOne.stringList, allNullableTypesTwo.stringList);
+  compareComplexLists(
+      allNullableTypesOne.boolList, allNullableTypesTwo.boolList);
+  compareComplexLists(
+      allNullableTypesOne.doubleList, allNullableTypesTwo.doubleList);
+  compareComplexLists(allNullableTypesOne.intList, allNullableTypesTwo.intList);
+  compareComplexLists(
+      allNullableTypesOne.enumList, allNullableTypesTwo.enumList);
+  compareComplexLists(
+      allNullableTypesOne.objectList, allNullableTypesTwo.objectList);
+  compareComplexLists(
+      allNullableTypesOne.listList, allNullableTypesTwo.listList);
+  compareComplexLists(allNullableTypesOne.mapList, allNullableTypesTwo.mapList);
+  compareComplexMaps(allNullableTypesOne.map, allNullableTypesTwo.map);
+  compareComplexMaps(
+      allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap);
+  compareComplexMaps(allNullableTypesOne.intMap, allNullableTypesTwo.intMap);
+  compareComplexMaps(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap);
+  compareComplexMaps(
+      allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap);
+  compareComplexMaps(allNullableTypesOne.listMap, allNullableTypesTwo.listMap);
+  compareComplexMaps(allNullableTypesOne.mapMap, allNullableTypesTwo.mapMap);
 }
 
 void compareAllTypes(AllTypes? allTypesOne, AllTypes? allTypesTwo) {
@@ -110,31 +144,22 @@ void compareAllTypes(AllTypes? allTypesOne, AllTypes? allTypesTwo) {
   expect(allTypesOne.aFloatArray, allTypesTwo.aFloatArray);
   expect(allTypesOne.anEnum, allTypesTwo.anEnum);
   expect(allTypesOne.anObject, allTypesTwo.anObject);
-  expect(listEquals(allTypesOne.list, allTypesTwo.list), true);
-  expect(listEquals(allTypesOne.stringList, allTypesTwo.stringList), true);
-  expect(listEquals(allTypesOne.intList, allTypesTwo.intList), true);
-  expect(listEquals(allTypesOne.doubleList, allTypesTwo.doubleList), true);
-  expect(listEquals(allTypesOne.boolList, allTypesTwo.boolList), true);
-  expect(listEquals(allTypesOne.enumList, allTypesTwo.enumList), true);
-  expect(listEquals(allTypesOne.objectList, allTypesTwo.objectList), true);
-  // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
-  // https://github.com/flutter/flutter/issues/116117
-  for (int i = 0; i < allTypesOne.listList.length; i++) {
-    expect(listEquals(allTypesOne.listList[i], allTypesTwo.listList[i]), true);
-  }
-  for (int i = 0; i < allTypesOne.mapList.length; i++) {
-    expect(mapEquals(allTypesOne.mapList[i], allTypesTwo.mapList[i]), true);
-  }
-  expect(mapEquals(allTypesOne.map, allTypesTwo.map), true);
-  expect(mapEquals(allTypesOne.stringMap, allTypesTwo.stringMap), true);
-  expect(mapEquals(allTypesOne.intMap, allTypesTwo.intMap), true);
-  // expect(mapEquals(allTypesOne.doubleMap, allTypesTwo.doubleMap), true);
-  // expect(mapEquals(allTypesOne.boolMap, allTypesTwo.boolMap), true);
-  expect(mapEquals(allTypesOne.enumMap, allTypesTwo.enumMap), true);
-  expect(mapEquals(allTypesOne.objectMap, allTypesTwo.objectMap), true);
-  // listMap: check each key and value, and compare each lists values
-  //
-  // mapMap: check each key and value, and compare each map in the same way
+  compareComplexLists(allTypesOne.list, allTypesTwo.list);
+  compareComplexLists(allTypesOne.stringList, allTypesTwo.stringList);
+  compareComplexLists(allTypesOne.boolList, allTypesTwo.boolList);
+  compareComplexLists(allTypesOne.doubleList, allTypesTwo.doubleList);
+  compareComplexLists(allTypesOne.intList, allTypesTwo.intList);
+  compareComplexLists(allTypesOne.enumList, allTypesTwo.enumList);
+  compareComplexLists(allTypesOne.objectList, allTypesTwo.objectList);
+  compareComplexLists(allTypesOne.listList, allTypesTwo.listList);
+  compareComplexLists(allTypesOne.mapList, allTypesTwo.mapList);
+  compareComplexMaps(allTypesOne.map, allTypesTwo.map);
+  compareComplexMaps(allTypesOne.stringMap, allTypesTwo.stringMap);
+  compareComplexMaps(allTypesOne.intMap, allTypesTwo.intMap);
+  compareComplexMaps(allTypesOne.enumMap, allTypesTwo.enumMap);
+  compareComplexMaps(allTypesOne.objectMap, allTypesTwo.objectMap);
+  compareComplexMaps(allTypesOne.listMap, allTypesTwo.listMap);
+  compareComplexMaps(allTypesOne.mapMap, allTypesTwo.mapMap);
 }
 
 void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
@@ -164,72 +189,34 @@ void compareAllNullableTypes(AllNullableTypes? allNullableTypesOne,
   expect(allNullableTypesOne.aNullableEnum, allNullableTypesTwo.aNullableEnum);
   compareAllNullableTypes(allNullableTypesOne.allNullableTypes,
       allNullableTypesTwo.allNullableTypes);
-  expect(listEquals(allNullableTypesOne.list, allNullableTypesTwo.list), true);
-  expect(
-      listEquals(
-          allNullableTypesOne.stringList, allNullableTypesTwo.stringList),
-      true);
-  expect(listEquals(allNullableTypesOne.boolList, allNullableTypesTwo.boolList),
-      true);
-  expect(
-      listEquals(
-          allNullableTypesOne.doubleList, allNullableTypesTwo.doubleList),
-      true);
-  expect(listEquals(allNullableTypesOne.intList, allNullableTypesTwo.intList),
-      true);
-  expect(listEquals(allNullableTypesOne.enumList, allNullableTypesTwo.enumList),
-      true);
-  expect(
-      listEquals(
-          allNullableTypesOne.objectList, allNullableTypesTwo.objectList),
-      true);
-  // TODO(stuartmorgan): Enable this once the Dart types are fixed; see
-  // https://github.com/flutter/flutter/issues/116117
-  for (int i = 0; i < (allNullableTypesOne.listList?.length ?? 0); i++) {
-    expect(
-        listEquals(
-            allNullableTypesOne.listList![i], allNullableTypesTwo.listList![i]),
-        true);
-  }
-  for (int i = 0; i < (allNullableTypesOne.mapList?.length ?? 0); i++) {
-    expect(
-        mapEquals(
-            allNullableTypesOne.mapList?[i], allNullableTypesTwo.mapList?[i]),
-        true);
-  }
-  for (int i = 0;
-      i < (allNullableTypesOne.recursiveClassList?.length ?? 0);
-      i++) {
-    compareAllNullableTypes(allNullableTypesOne.recursiveClassList?[i],
-        allNullableTypesTwo.recursiveClassList?[i]);
-  }
-  for (int i = 0;
-      i < (allNullableTypesOne.recursiveClassList?.length ?? 0);
-      i++) {
-    compareAllNullableTypes(allNullableTypesOne.recursiveClassList?[i],
-        allNullableTypesTwo.recursiveClassList?[i]);
-  }
-  expect(mapEquals(allNullableTypesOne.map, allNullableTypesTwo.map), true);
-  expect(
-      mapEquals(allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap),
-      true);
-  expect(
-      mapEquals(allNullableTypesOne.intMap, allNullableTypesTwo.intMap), true);
-  // expect(
-  //     mapEquals(allNullableTypesOne.doubleMap, allNullableTypesTwo.doubleMap),
-  //     true);
-  // expect(mapEquals(allNullableTypesOne.boolMap, allNullableTypesTwo.boolMap),
-  //     true);
-  expect(mapEquals(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap),
-      true);
-  expect(
-      mapEquals(allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap),
-      true);
-  // listMap: check each key and value, and compare each lists values
-  //
-  // mapMap: check each key and value, and compare each map in the same way
-  //
-  // recursiveClassMap: check each key and value, call each compare method for every class
+  compareComplexLists(allNullableTypesOne.list, allNullableTypesTwo.list);
+  compareComplexLists(
+      allNullableTypesOne.stringList, allNullableTypesTwo.stringList);
+  compareComplexLists(
+      allNullableTypesOne.boolList, allNullableTypesTwo.boolList);
+  compareComplexLists(
+      allNullableTypesOne.doubleList, allNullableTypesTwo.doubleList);
+  compareComplexLists(allNullableTypesOne.intList, allNullableTypesTwo.intList);
+  compareComplexLists(
+      allNullableTypesOne.enumList, allNullableTypesTwo.enumList);
+  compareComplexLists(
+      allNullableTypesOne.objectList, allNullableTypesTwo.objectList);
+  compareComplexLists(
+      allNullableTypesOne.listList, allNullableTypesTwo.listList);
+  compareComplexLists(allNullableTypesOne.recursiveClassList,
+      allNullableTypesTwo.recursiveClassList);
+  compareComplexLists(allNullableTypesOne.mapList, allNullableTypesTwo.mapList);
+  compareComplexMaps(allNullableTypesOne.map, allNullableTypesTwo.map);
+  compareComplexMaps(
+      allNullableTypesOne.stringMap, allNullableTypesTwo.stringMap);
+  compareComplexMaps(allNullableTypesOne.intMap, allNullableTypesTwo.intMap);
+  compareComplexMaps(allNullableTypesOne.enumMap, allNullableTypesTwo.enumMap);
+  compareComplexMaps(
+      allNullableTypesOne.objectMap, allNullableTypesTwo.objectMap);
+  compareComplexMaps(allNullableTypesOne.listMap, allNullableTypesTwo.listMap);
+  compareComplexMaps(allNullableTypesOne.mapMap, allNullableTypesTwo.mapMap);
+  compareComplexMaps(allNullableTypesOne.recursiveClassMap,
+      allNullableTypesTwo.recursiveClassMap);
 }
 
 void compareAllClassesWrapper(
@@ -255,8 +242,8 @@ void compareAllClassesWrapper(
     compareAllNullableTypesWithoutRecursion(
         wrapperOne.nullableClassList![i], wrapperTwo.nullableClassList![i]);
   }
-  //
-  // ClassMap: check each key and value, call each compare method for every class
+  compareComplexMaps(wrapperOne.classMap, wrapperTwo.classMap);
+  compareComplexMaps(wrapperOne.nullableClassMap, wrapperTwo.nullableClassMap);
 }
 
 final List<Object> nonNullList = <Object>[

From f20fd97476e28ea5c049c68e4e0e5c918834c2f2 Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Wed, 18 Sep 2024 16:55:53 -0700
Subject: [PATCH 7/8] change changelog

---
 packages/pigeon/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index 1babb7abe2f..d771e62f57f 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 22.5.0
 
-* Adds support for nested collections.
+* Validates support for nested collections with generic types.
 
 ## 22.4.0
 

From 93d460026e1e52fd12e8311b2423f187a5649cca Mon Sep 17 00:00:00 2001
From: tarrinneal <tarrinneal@gmail.com>
Date: Wed, 18 Sep 2024 17:44:16 -0700
Subject: [PATCH 8/8] revert versioning

---
 packages/pigeon/CHANGELOG.md             | 4 ----
 packages/pigeon/lib/generator_tools.dart | 2 +-
 packages/pigeon/pubspec.yaml             | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index d771e62f57f..f7fe2a3ba1a 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 22.5.0
-
-* Validates support for nested collections with generic types.
-
 ## 22.4.0
 
 * Adds support for non-nullable types in collections.
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 37bce3f6402..1474098aeac 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -14,7 +14,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '22.5.0';
+const String pigeonVersion = '22.4.0';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index 39b0b8854b2..c2e58e40761 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 22.5.0 # This must match the version in lib/generator_tools.dart
+version: 22.4.0 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ^3.3.0