diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index 0f7a708c875a..35ff74e15e59 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 9.0.6
+
+* [kotlin] Removes safe casting from decode process.
+* [swift] Removes safe casting from decode process.
+
 ## 9.0.5
 
 * Removes the unnecessary Flutter constraint.
@@ -688,7 +693,7 @@ class Foo {
 
 ## 0.1.0-experimental.3
 
-* Added support for for Android Java.
+* Added support for Android Java.
 
 ## 0.1.0-experimental.2
 
diff --git a/packages/pigeon/lib/ast.dart b/packages/pigeon/lib/ast.dart
index 08ddcbdb5198..820cdee84160 100644
--- a/packages/pigeon/lib/ast.dart
+++ b/packages/pigeon/lib/ast.dart
@@ -61,7 +61,7 @@ class Method extends Node {
   /// Specifies how handlers are dispatched with respect to threading.
   TaskQueueType taskQueueType;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
@@ -101,7 +101,7 @@ class Api extends Node {
   /// The name of the Dart test interface to generate to help with testing.
   String? dartHostTestHandler;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
@@ -194,7 +194,7 @@ class NamedType extends Node {
   /// The offset in the source file where the [NamedType] appears.
   int? offset;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
@@ -222,7 +222,7 @@ class Class extends Node {
   /// All the fields contained in the class.
   List<NamedType> fields;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
@@ -250,7 +250,7 @@ class Enum extends Node {
   /// All of the members of the enum.
   List<EnumMember> members;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
@@ -274,7 +274,7 @@ class EnumMember extends Node {
   /// The name of the enum member.
   final String name;
 
-  /// List of documentation comments, seperated by line.
+  /// List of documentation comments, separated by line.
   ///
   /// Lines should not include the comment marker itself, but should include any
   /// leading whitespace, so that any indentation in the original comment is preserved.
diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp_generator.dart
index fc6be2fd2a45..b983fb983ccb 100644
--- a/packages/pigeon/lib/cpp_generator.dart
+++ b/packages/pigeon/lib/cpp_generator.dart
@@ -656,7 +656,7 @@ const flutter::StandardMessageCodec& ${api.name}::GetCodec() {
       final HostDatatype returnType = getHostDatatype(func.returnType,
           root.classes, root.enums, _shortBaseCppTypeForBuiltinDartType);
 
-      // Determine the input paramater list, saved in a structured form for later
+      // Determine the input parameter list, saved in a structured form for later
       // use as platform channel call arguments.
       final Iterable<_HostNamedType> hostParameters =
           indexMap(func.arguments, (int i, NamedType arg) {
@@ -1265,7 +1265,7 @@ String _hostApiReturnType(HostDatatype type) {
   return 'ErrorOr<$valueType>';
 }
 
-/// Returns the C++ type to use for the paramer to the asyncronous "return"
+/// Returns the C++ type to use for the paramer to the asynchronous "return"
 /// callback of a Flutter API method returning [type].
 String _flutterApiReturnType(HostDatatype type) {
   if (type.datatype == 'void') {
diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart
index 79e2c000092a..b3342452c0ff 100644
--- a/packages/pigeon/lib/dart_generator.dart
+++ b/packages/pigeon/lib/dart_generator.dart
@@ -431,7 +431,7 @@ $resultAt != null
   ///
   /// Messages will be sent and received in a list.
   ///
-  /// If the message recieved was succesful,
+  /// If the message received was successful,
   /// the result will be contained at the 0'th index.
   ///
   /// If the message was a failure, the list will contain 3 items:
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 6bebaaac49bb..8dcc93bbdfba 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -11,7 +11,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '9.0.5';
+const String pigeonVersion = '9.0.6';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {
diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin_generator.dart
index 68584aee1594..ff9148bea15e 100644
--- a/packages/pigeon/lib/kotlin_generator.dart
+++ b/packages/pigeon/lib/kotlin_generator.dart
@@ -242,11 +242,10 @@ class KotlinGenerator extends StructuredGenerator<KotlinOptions> {
               });
             } else if (isInt) {
               indent.write('val ${field.name} = $listValue');
-              indent.addln(
-                  '.let { if (it is Int) it.toLong() else it as Long? }');
+              indent.addln('.let { ${_cast(listValue, type: field.type)} }');
             } else {
               indent.writeln(
-                  'val ${field.name} = ${_cast(listValue, kotlinType: '$fieldType?')}');
+                  'val ${field.name} = ${_cast(listValue, type: field.type)}');
             }
           } else {
             if (!hostDatatype.isBuiltin &&
@@ -259,11 +258,10 @@ class KotlinGenerator extends StructuredGenerator<KotlinOptions> {
                   'val ${field.name} = $fieldType.ofRaw($listValue as Int)!!');
             } else if (isInt) {
               indent.write('val ${field.name} = $listValue');
-              indent
-                  .addln('.let { if (it is Int) it.toLong() else it as Long }');
+              indent.addln('.let { ${_cast(listValue, type: field.type)} }');
             } else {
               indent.writeln(
-                  'val ${field.name} = ${_cast(listValue, kotlinType: fieldType)}');
+                  'val ${field.name} = ${_cast(listValue, type: field.type)}');
             }
           }
         });
@@ -384,15 +382,8 @@ class KotlinGenerator extends StructuredGenerator<KotlinOptions> {
             });
           } else {
             indent.addScoped('{', '}', () {
-              if (func.returnType.baseName == 'int') {
-                final String forceUnwrap =
-                    func.returnType.isNullable ? '?' : '';
-                indent.writeln(
-                    'val result = if (it is Int) it.toLong() else it as$forceUnwrap Long');
-              } else {
-                indent.writeln(
-                    'val result = ${_cast('it', kotlinType: returnType, safeCast: func.returnType.isNullable)}');
-              }
+              indent.writeln(
+                  'val result = ${_cast('it', type: func.returnType)}');
               indent.writeln('callback(result)');
             });
           }
@@ -678,11 +669,9 @@ String _castForceUnwrap(String value, TypeDeclaration type, Root root) {
     // a Dart 'int'.  To keep things simple we just use 64bit
     // longs in Pigeon with Kotlin.
     if (type.baseName == 'int') {
-      final String castUnwrap = type.isNullable ? '?' : '';
-      return '$value.let { if (it is Int) it.toLong() else it as$castUnwrap Long }';
+      return '$value.let { ${_cast(value, type: type)} }';
     } else {
-      return _cast(value,
-          kotlinType: _kotlinTypeForDartType(type), safeCast: type.isNullable);
+      return _cast(value, type: type);
     }
   }
 }
@@ -748,11 +737,19 @@ String _nullsafeKotlinTypeForDartType(TypeDeclaration type) {
 }
 
 /// Returns an expression to cast [variable] to [kotlinType].
-String _cast(String variable,
-    {required String kotlinType, bool safeCast = false}) {
+String _cast(String variable, {required TypeDeclaration type}) {
   // Special-case Any, since no-op casts cause warnings.
-  if (kotlinType == 'Any?' || (safeCast && kotlinType == 'Any')) {
+  final String typeString = _kotlinTypeForDartType(type);
+  if (type.isNullable && typeString == 'Any') {
     return variable;
   }
-  return '$variable as${safeCast ? '?' : ''} $kotlinType';
+  if (typeString == 'Int' || typeString == 'Long') {
+    return _castInt(type.isNullable);
+  }
+  return '$variable as ${_nullsafeKotlinTypeForDartType(type)}';
+}
+
+String _castInt(bool isNullable) {
+  final String nullability = isNullable ? '?' : '';
+  return 'if (it is Int) it.toLong() else it as Long$nullability';
 }
diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart
index b480bea18013..57180c851052 100644
--- a/packages/pigeon/lib/objc_generator.dart
+++ b/packages/pigeon/lib/objc_generator.dart
@@ -893,7 +893,7 @@ String _className(String? prefix, String className) {
   }
 }
 
-/// Calculates callback block signature for for async methods.
+/// Calculates callback block signature for async methods.
 String _callbackForType(TypeDeclaration type, _ObjcPtr objcType) {
   return type.isVoid
       ? 'void (^)(FlutterError *_Nullable)'
diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart
index 2ba822b97518..ab47807ab5b7 100644
--- a/packages/pigeon/lib/swift_generator.dart
+++ b/packages/pigeon/lib/swift_generator.dart
@@ -455,7 +455,7 @@ import FlutterMacOS
             indent.addScoped('{ $messageVarName, reply in', '}', () {
               final List<String> methodArgument = <String>[];
               if (components.arguments.isNotEmpty) {
-                indent.writeln('let args = message as! [Any?]');
+                indent.writeln('let args = message as! [Any]');
                 enumerate(components.arguments,
                     (int index, _SwiftFunctionArgument arg) {
                   final String argName =
@@ -668,17 +668,17 @@ String _camelCase(String text) {
 }
 
 String _castForceUnwrap(String value, TypeDeclaration type, Root root) {
+  final String forceUnwrap = type.isNullable ? '' : '!';
   if (isEnum(root, type)) {
-    final String forceUnwrap = type.isNullable ? '' : '!';
     final String nullableConditionPrefix =
         type.isNullable ? '$value == nil ? nil : ' : '';
     return '$nullableConditionPrefix${_swiftTypeForDartType(type)}(rawValue: $value as! Int)$forceUnwrap';
   } else if (type.baseName == 'Object') {
     // Special-cased to avoid warnings about using 'as' with Any.
-    return type.isNullable ? value : '$value!';
+    return value;
   } else {
-    final String castUnwrap = type.isNullable ? '?' : '!';
-    return '$value as$castUnwrap ${_swiftTypeForDartType(type)}';
+    final String castUnwrap = type.isNullable ? '?' : '';
+    return '$value as! ${_swiftTypeForDartType(type)}$castUnwrap';
   }
 }
 
diff --git a/packages/pigeon/mock_handler_tester/test/message.dart b/packages/pigeon/mock_handler_tester/test/message.dart
index d6289b4d56fc..ab906a9d3226 100644
--- a/packages/pigeon/mock_handler_tester/test/message.dart
+++ b/packages/pigeon/mock_handler_tester/test/message.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/mock_handler_tester/test/test.dart b/packages/pigeon/mock_handler_tester/test/test.dart
index 71d22916a982..5007a0b2549f 100644
--- a/packages/pigeon/mock_handler_tester/test/test.dart
+++ b/packages/pigeon/mock_handler_tester/test/test.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import
 // ignore_for_file: avoid_relative_lib_imports
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 5258c81cbe4b..73ece6e38974 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.example.alternate_language_test_plugin;
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 32e8ed7c8aa5..57c56b8bb1d7 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
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 3402a274e630..d34977e06f47 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "CoreTests.gen.h"
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart
index ac5c741d4191..b5fd919cd986 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart
index e5187c3193c1..5a6192d637a3 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart
index 86ae58b88d0c..e37512150ea0 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart
index de3f06dbfe36..30f32bf65af1 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart
index 011c969194da..23194cecbf6f 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart
index 5b9b1d7a1583..0bf2de294c03 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart
index 7bf628c364c6..d9431755534b 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.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.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
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 fbc87c570b9a..1f84a0ff4f84 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
@@ -744,7 +744,7 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      const String sentObject = 'Hello, asyncronously!';
+      const String sentObject = 'Hello, asynchronously!';
 
       final String echoObject = await api.echoAsyncString(sentObject);
       expect(echoObject, sentObject);
@@ -840,7 +840,7 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
         (WidgetTester _) async {
       final HostIntegrationCoreApi api = HostIntegrationCoreApi();
 
-      const String sentObject = 'Hello, asyncronously!';
+      const String sentObject = 'Hello, asynchronously!';
 
       final String? echoObject = await api.echoAsyncNullableString(sentObject);
       expect(echoObject, sentObject);
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 ac5c741d4191..b5fd919cd986 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
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 1884bd2b5cd7..d504f7e83333 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // 
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.example.test_plugin
@@ -594,7 +594,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val everythingArg = args[0] as? AllNullableTypes
+            val everythingArg = args[0] as AllNullableTypes?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoAllNullableTypes(everythingArg))
@@ -630,7 +630,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val nullableStringArg = args[0] as? String
+            val nullableStringArg = args[0] as String?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.createNestedNullableString(nullableStringArg))
@@ -648,9 +648,9 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableBoolArg = args[0] as? Boolean
-            val aNullableIntArg = args[1].let { if (it is Int) it.toLong() else it as? Long }
-            val aNullableStringArg = args[2] as? String
+            val aNullableBoolArg = args[0] as Boolean?
+            val aNullableIntArg = args[1].let { if (it is Int) it.toLong() else it as Long? }
+            val aNullableStringArg = args[2] as String?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.sendMultipleNullableTypes(aNullableBoolArg, aNullableIntArg, aNullableStringArg))
@@ -668,7 +668,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableIntArg = args[0].let { if (it is Int) it.toLong() else it as? Long }
+            val aNullableIntArg = args[0].let { if (it is Int) it.toLong() else it as Long? }
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableInt(aNullableIntArg))
@@ -686,7 +686,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableDoubleArg = args[0] as? Double
+            val aNullableDoubleArg = args[0] as Double?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableDouble(aNullableDoubleArg))
@@ -704,7 +704,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableBoolArg = args[0] as? Boolean
+            val aNullableBoolArg = args[0] as Boolean?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableBool(aNullableBoolArg))
@@ -722,7 +722,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableStringArg = args[0] as? String
+            val aNullableStringArg = args[0] as String?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableString(aNullableStringArg))
@@ -740,7 +740,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableUint8ListArg = args[0] as? ByteArray
+            val aNullableUint8ListArg = args[0] as ByteArray?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableUint8List(aNullableUint8ListArg))
@@ -776,7 +776,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableListArg = args[0] as? List<Any?>
+            val aNullableListArg = args[0] as List<Any?>?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableList(aNullableListArg))
@@ -794,7 +794,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableMapArg = args[0] as? Map<String?, Any?>
+            val aNullableMapArg = args[0] as Map<String?, Any?>?
             var wrapped: List<Any?>
             try {
               wrapped = listOf<Any?>(api.echoNullableMap(aNullableMapArg))
@@ -1044,7 +1044,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val everythingArg = args[0] as? AllNullableTypes
+            val everythingArg = args[0] as AllNullableTypes?
             api.echoAsyncNullableAllNullableTypes(everythingArg) { result: Result<AllNullableTypes?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1064,7 +1064,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anIntArg = args[0].let { if (it is Int) it.toLong() else it as? Long }
+            val anIntArg = args[0].let { if (it is Int) it.toLong() else it as Long? }
             api.echoAsyncNullableInt(anIntArg) { result: Result<Long?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1084,7 +1084,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aDoubleArg = args[0] as? Double
+            val aDoubleArg = args[0] as Double?
             api.echoAsyncNullableDouble(aDoubleArg) { result: Result<Double?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1104,7 +1104,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aBoolArg = args[0] as? Boolean
+            val aBoolArg = args[0] as Boolean?
             api.echoAsyncNullableBool(aBoolArg) { result: Result<Boolean?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1124,7 +1124,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aStringArg = args[0] as? String
+            val aStringArg = args[0] as String?
             api.echoAsyncNullableString(aStringArg) { result: Result<String?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1144,7 +1144,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aUint8ListArg = args[0] as? ByteArray
+            val aUint8ListArg = args[0] as ByteArray?
             api.echoAsyncNullableUint8List(aUint8ListArg) { result: Result<ByteArray?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1184,7 +1184,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aListArg = args[0] as? List<Any?>
+            val aListArg = args[0] as List<Any?>?
             api.echoAsyncNullableList(aListArg) { result: Result<List<Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1204,7 +1204,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aMapArg = args[0] as? Map<String?, Any?>
+            val aMapArg = args[0] as Map<String?, Any?>?
             api.echoAsyncNullableMap(aMapArg) { result: Result<Map<String?, Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1296,9 +1296,9 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aNullableBoolArg = args[0] as? Boolean
-            val aNullableIntArg = args[1].let { if (it is Int) it.toLong() else it as? Long }
-            val aNullableStringArg = args[2] as? String
+            val aNullableBoolArg = args[0] as Boolean?
+            val aNullableIntArg = args[1].let { if (it is Int) it.toLong() else it as Long? }
+            val aNullableStringArg = args[2] as String?
             api.callFlutterSendMultipleNullableTypes(aNullableBoolArg, aNullableIntArg, aNullableStringArg) { result: Result<AllNullableTypes> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1458,7 +1458,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aBoolArg = args[0] as? Boolean
+            val aBoolArg = args[0] as Boolean?
             api.callFlutterEchoNullableBool(aBoolArg) { result: Result<Boolean?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1478,7 +1478,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val anIntArg = args[0].let { if (it is Int) it.toLong() else it as? Long }
+            val anIntArg = args[0].let { if (it is Int) it.toLong() else it as Long? }
             api.callFlutterEchoNullableInt(anIntArg) { result: Result<Long?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1498,7 +1498,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aDoubleArg = args[0] as? Double
+            val aDoubleArg = args[0] as Double?
             api.callFlutterEchoNullableDouble(aDoubleArg) { result: Result<Double?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1518,7 +1518,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aStringArg = args[0] as? String
+            val aStringArg = args[0] as String?
             api.callFlutterEchoNullableString(aStringArg) { result: Result<String?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1538,7 +1538,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aListArg = args[0] as? ByteArray
+            val aListArg = args[0] as ByteArray?
             api.callFlutterEchoNullableUint8List(aListArg) { result: Result<ByteArray?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1558,7 +1558,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aListArg = args[0] as? List<Any?>
+            val aListArg = args[0] as List<Any?>?
             api.callFlutterEchoNullableList(aListArg) { result: Result<List<Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1578,7 +1578,7 @@ interface HostIntegrationCoreApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val aMapArg = args[0] as? Map<String?, Any?>
+            val aMapArg = args[0] as Map<String?, Any?>?
             api.callFlutterEchoNullableMap(aMapArg) { result: Result<Map<String?, Any?>?> ->
               val error = result.exceptionOrNull()
               if (error != null) {
@@ -1773,7 +1773,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableBool(aBoolArg: Boolean?, callback: (Boolean?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", codec)
     channel.send(listOf(aBoolArg)) {
-      val result = it as? Boolean?
+      val result = it as Boolean?
       callback(result)
     }
   }
@@ -1781,7 +1781,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableInt(anIntArg: Long?, callback: (Long?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", codec)
     channel.send(listOf(anIntArg)) {
-      val result = if (it is Int) it.toLong() else it as? Long
+      val result = if (it is Int) it.toLong() else it as Long?
       callback(result)
     }
   }
@@ -1789,7 +1789,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableDouble(aDoubleArg: Double?, callback: (Double?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", codec)
     channel.send(listOf(aDoubleArg)) {
-      val result = it as? Double?
+      val result = it as Double?
       callback(result)
     }
   }
@@ -1797,7 +1797,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableString(aStringArg: String?, callback: (String?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", codec)
     channel.send(listOf(aStringArg)) {
-      val result = it as? String?
+      val result = it as String?
       callback(result)
     }
   }
@@ -1805,7 +1805,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableUint8List(aListArg: ByteArray?, callback: (ByteArray?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", codec)
     channel.send(listOf(aListArg)) {
-      val result = it as? ByteArray?
+      val result = it as ByteArray?
       callback(result)
     }
   }
@@ -1813,7 +1813,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableList(aListArg: List<Any?>?, callback: (List<Any?>?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", codec)
     channel.send(listOf(aListArg)) {
-      val result = it as? List<Any?>?
+      val result = it as List<Any?>?
       callback(result)
     }
   }
@@ -1821,7 +1821,7 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) {
   fun echoNullableMap(aMapArg: Map<String?, Any?>?, callback: (Map<String?, Any?>?) -> Unit) {
     val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", codec)
     channel.send(listOf(aMapArg)) {
-      val result = it as? Map<String?, Any?>?
+      val result = it as Map<String?, Any?>?
       callback(result)
     }
   }
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 a5fca2869c1d..d478feb1bf35 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // 
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -406,7 +406,7 @@ class HostIntegrationCoreApiSetup {
     let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         do {
           let result = try api.echo(everythingArg)
@@ -450,7 +450,7 @@ class HostIntegrationCoreApiSetup {
     let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         do {
           let result = try api.echo(anIntArg)
@@ -466,7 +466,7 @@ class HostIntegrationCoreApiSetup {
     let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         do {
           let result = try api.echo(aDoubleArg)
@@ -482,7 +482,7 @@ class HostIntegrationCoreApiSetup {
     let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         do {
           let result = try api.echo(aBoolArg)
@@ -498,7 +498,7 @@ class HostIntegrationCoreApiSetup {
     let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         do {
           let result = try api.echo(aStringArg)
@@ -514,7 +514,7 @@ class HostIntegrationCoreApiSetup {
     let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aUint8ListArg = args[0] as! FlutterStandardTypedData
         do {
           let result = try api.echo(aUint8ListArg)
@@ -530,8 +530,8 @@ class HostIntegrationCoreApiSetup {
     let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anObjectArg = args[0]!
+        let args = message as! [Any]
+        let anObjectArg = args[0]
         do {
           let result = try api.echo(anObjectArg)
           reply(wrapResult(result))
@@ -546,7 +546,7 @@ class HostIntegrationCoreApiSetup {
     let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         do {
           let result = try api.echo(aListArg)
@@ -562,7 +562,7 @@ class HostIntegrationCoreApiSetup {
     let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         do {
           let result = try api.echo(aMapArg)
@@ -578,8 +578,8 @@ class HostIntegrationCoreApiSetup {
     let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAllNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let everythingArg = args[0] as? AllNullableTypes
+        let args = message as! [Any]
+        let everythingArg = args[0] as! AllNullableTypes?
         do {
           let result = try api.echo(everythingArg)
           reply(wrapResult(result))
@@ -595,7 +595,7 @@ class HostIntegrationCoreApiSetup {
     let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       extractNestedNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let wrapperArg = args[0] as! AllNullableTypesWrapper
         do {
           let result = try api.extractNestedNullableString(from: wrapperArg)
@@ -612,8 +612,8 @@ class HostIntegrationCoreApiSetup {
     let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       createNestedNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let nullableStringArg = args[0] as? String
+        let args = message as! [Any]
+        let nullableStringArg = args[0] as! String?
         do {
           let result = try api.createNestedObject(with: nullableStringArg)
           reply(wrapResult(result))
@@ -628,10 +628,10 @@ class HostIntegrationCoreApiSetup {
     let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       sendMultipleNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
-        let aNullableIntArg = args[1] as? Int32
-        let aNullableStringArg = args[2] as? String
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
+        let aNullableIntArg = args[1] as! Int32?
+        let aNullableStringArg = args[2] as! String?
         do {
           let result = try api.sendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg)
           reply(wrapResult(result))
@@ -646,8 +646,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let aNullableIntArg = args[0] as! Int32?
         do {
           let result = try api.echo(aNullableIntArg)
           reply(wrapResult(result))
@@ -662,8 +662,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aNullableDoubleArg = args[0] as! Double?
         do {
           let result = try api.echo(aNullableDoubleArg)
           reply(wrapResult(result))
@@ -678,8 +678,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
         do {
           let result = try api.echo(aNullableBoolArg)
           reply(wrapResult(result))
@@ -694,8 +694,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aNullableStringArg = args[0] as! String?
         do {
           let result = try api.echo(aNullableStringArg)
           reply(wrapResult(result))
@@ -710,8 +710,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableUint8ListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aNullableUint8ListArg = args[0] as! FlutterStandardTypedData?
         do {
           let result = try api.echo(aNullableUint8ListArg)
           reply(wrapResult(result))
@@ -726,7 +726,7 @@ class HostIntegrationCoreApiSetup {
     let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aNullableObjectArg = args[0]
         do {
           let result = try api.echo(aNullableObjectArg)
@@ -742,8 +742,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aNullableListArg = args[0] as! [Any?]?
         do {
           let result = try api.echoNullable(aNullableListArg)
           reply(wrapResult(result))
@@ -758,8 +758,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aNullableMapArg = args[0] as! [String?: Any?]?
         do {
           let result = try api.echoNullable(aNullableMapArg)
           reply(wrapResult(result))
@@ -791,7 +791,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         api.echoAsync(anIntArg) { result in
           switch result {
@@ -809,7 +809,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         api.echoAsync(aDoubleArg) { result in
           switch result {
@@ -827,7 +827,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         api.echoAsync(aBoolArg) { result in
           switch result {
@@ -845,7 +845,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.echoAsync(aStringArg) { result in
           switch result {
@@ -863,7 +863,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aUint8ListArg = args[0] as! FlutterStandardTypedData
         api.echoAsync(aUint8ListArg) { result in
           switch result {
@@ -881,8 +881,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anObjectArg = args[0]!
+        let args = message as! [Any]
+        let anObjectArg = args[0]
         api.echoAsync(anObjectArg) { result in
           switch result {
             case .success(let res):
@@ -899,7 +899,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         api.echoAsync(aListArg) { result in
           switch result {
@@ -917,7 +917,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         api.echoAsync(aMapArg) { result in
           switch result {
@@ -967,7 +967,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         api.echoAsync(everythingArg) { result in
           switch result {
@@ -985,8 +985,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let everythingArg = args[0] as? AllNullableTypes
+        let args = message as! [Any]
+        let everythingArg = args[0] as! AllNullableTypes?
         api.echoAsync(everythingArg) { result in
           switch result {
             case .success(let res):
@@ -1003,8 +1003,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let anIntArg = args[0] as! Int32?
         api.echoAsyncNullable(anIntArg) { result in
           switch result {
             case .success(let res):
@@ -1021,8 +1021,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aDoubleArg = args[0] as! Double?
         api.echoAsyncNullable(aDoubleArg) { result in
           switch result {
             case .success(let res):
@@ -1039,8 +1039,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aBoolArg = args[0] as! Bool?
         api.echoAsyncNullable(aBoolArg) { result in
           switch result {
             case .success(let res):
@@ -1057,8 +1057,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aStringArg = args[0] as! String?
         api.echoAsyncNullable(aStringArg) { result in
           switch result {
             case .success(let res):
@@ -1075,8 +1075,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aUint8ListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aUint8ListArg = args[0] as! FlutterStandardTypedData?
         api.echoAsyncNullable(aUint8ListArg) { result in
           switch result {
             case .success(let res):
@@ -1093,7 +1093,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anObjectArg = args[0]
         api.echoAsyncNullable(anObjectArg) { result in
           switch result {
@@ -1111,8 +1111,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aListArg = args[0] as! [Any?]?
         api.echoAsyncNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1129,8 +1129,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aMapArg = args[0] as! [String?: Any?]?
         api.echAsyncoNullable(aMapArg) { result in
           switch result {
             case .success(let res):
@@ -1191,7 +1191,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         api.callFlutterEcho(everythingArg) { result in
           switch result {
@@ -1208,10 +1208,10 @@ class HostIntegrationCoreApiSetup {
     let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
-        let aNullableIntArg = args[1] as? Int32
-        let aNullableStringArg = args[2] as? String
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
+        let aNullableIntArg = args[1] as! Int32?
+        let aNullableStringArg = args[2] as! String?
         api.callFlutterSendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg) { result in
           switch result {
             case .success(let res):
@@ -1227,7 +1227,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         api.callFlutterEcho(aBoolArg) { result in
           switch result {
@@ -1244,7 +1244,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         api.callFlutterEcho(anIntArg) { result in
           switch result {
@@ -1261,7 +1261,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         api.callFlutterEcho(aDoubleArg) { result in
           switch result {
@@ -1278,7 +1278,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.callFlutterEcho(aStringArg) { result in
           switch result {
@@ -1295,7 +1295,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! FlutterStandardTypedData
         api.callFlutterEcho(aListArg) { result in
           switch result {
@@ -1312,7 +1312,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         api.callFlutterEcho(aListArg) { result in
           switch result {
@@ -1329,7 +1329,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         api.callFlutterEcho(aMapArg) { result in
           switch result {
@@ -1346,8 +1346,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aBoolArg = args[0] as! Bool?
         api.callFlutterEchoNullable(aBoolArg) { result in
           switch result {
             case .success(let res):
@@ -1363,8 +1363,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let anIntArg = args[0] as! Int32?
         api.callFlutterEchoNullable(anIntArg) { result in
           switch result {
             case .success(let res):
@@ -1380,8 +1380,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aDoubleArg = args[0] as! Double?
         api.callFlutterEchoNullable(aDoubleArg) { result in
           switch result {
             case .success(let res):
@@ -1397,8 +1397,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aStringArg = args[0] as! String?
         api.callFlutterEchoNullable(aStringArg) { result in
           switch result {
             case .success(let res):
@@ -1414,8 +1414,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aListArg = args[0] as! FlutterStandardTypedData?
         api.callFlutterEchoNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1431,8 +1431,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aListArg = args[0] as! [Any?]?
         api.callFlutterEchoNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1448,8 +1448,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aMapArg = args[0] as! [String?: Any?]?
         api.callFlutterEchoNullable(aMapArg) { result in
           switch result {
             case .success(let res):
@@ -1636,7 +1636,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Bool?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aBoolArg] as [Any?]) { response in
-      let result = response as? Bool
+      let result = response as! Bool?
       completion(result)
     }
   }
@@ -1644,7 +1644,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ anIntArg: Int32?, completion: @escaping (Int32?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([anIntArg] as [Any?]) { response in
-      let result = response as? Int32
+      let result = response as! Int32?
       completion(result)
     }
   }
@@ -1652,7 +1652,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aDoubleArg: Double?, completion: @escaping (Double?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aDoubleArg] as [Any?]) { response in
-      let result = response as? Double
+      let result = response as! Double?
       completion(result)
     }
   }
@@ -1660,7 +1660,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aStringArg: String?, completion: @escaping (String?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aStringArg] as [Any?]) { response in
-      let result = response as? String
+      let result = response as! String?
       completion(result)
     }
   }
@@ -1668,7 +1668,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aListArg: FlutterStandardTypedData?, completion: @escaping (FlutterStandardTypedData?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aListArg] as [Any?]) { response in
-      let result = response as? FlutterStandardTypedData
+      let result = response as! FlutterStandardTypedData?
       completion(result)
     }
   }
@@ -1676,7 +1676,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aListArg: [Any?]?, completion: @escaping ([Any?]?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aListArg] as [Any?]) { response in
-      let result = response as? [Any?]
+      let result = response as! [Any?]?
       completion(result)
     }
   }
@@ -1684,7 +1684,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aMapArg: [String?: Any?]?, completion: @escaping ([String?: Any?]?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aMapArg] as [Any?]) { response in
-      let result = response as? [String?: Any?]
+      let result = response as! [String?: Any?]?
       completion(result)
     }
   }
@@ -1748,7 +1748,7 @@ class HostSmallApiSetup {
     let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.echo", binaryMessenger: binaryMessenger)
     if let api = api {
       echoChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.echo(aString: aStringArg) { result in
           switch result {
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 a5fca2869c1d..d478feb1bf35 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // 
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -406,7 +406,7 @@ class HostIntegrationCoreApiSetup {
     let echoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         do {
           let result = try api.echo(everythingArg)
@@ -450,7 +450,7 @@ class HostIntegrationCoreApiSetup {
     let echoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         do {
           let result = try api.echo(anIntArg)
@@ -466,7 +466,7 @@ class HostIntegrationCoreApiSetup {
     let echoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         do {
           let result = try api.echo(aDoubleArg)
@@ -482,7 +482,7 @@ class HostIntegrationCoreApiSetup {
     let echoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         do {
           let result = try api.echo(aBoolArg)
@@ -498,7 +498,7 @@ class HostIntegrationCoreApiSetup {
     let echoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         do {
           let result = try api.echo(aStringArg)
@@ -514,7 +514,7 @@ class HostIntegrationCoreApiSetup {
     let echoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aUint8ListArg = args[0] as! FlutterStandardTypedData
         do {
           let result = try api.echo(aUint8ListArg)
@@ -530,8 +530,8 @@ class HostIntegrationCoreApiSetup {
     let echoObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anObjectArg = args[0]!
+        let args = message as! [Any]
+        let anObjectArg = args[0]
         do {
           let result = try api.echo(anObjectArg)
           reply(wrapResult(result))
@@ -546,7 +546,7 @@ class HostIntegrationCoreApiSetup {
     let echoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         do {
           let result = try api.echo(aListArg)
@@ -562,7 +562,7 @@ class HostIntegrationCoreApiSetup {
     let echoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         do {
           let result = try api.echo(aMapArg)
@@ -578,8 +578,8 @@ class HostIntegrationCoreApiSetup {
     let echoAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAllNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let everythingArg = args[0] as? AllNullableTypes
+        let args = message as! [Any]
+        let everythingArg = args[0] as! AllNullableTypes?
         do {
           let result = try api.echo(everythingArg)
           reply(wrapResult(result))
@@ -595,7 +595,7 @@ class HostIntegrationCoreApiSetup {
     let extractNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.extractNestedNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       extractNestedNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let wrapperArg = args[0] as! AllNullableTypesWrapper
         do {
           let result = try api.extractNestedNullableString(from: wrapperArg)
@@ -612,8 +612,8 @@ class HostIntegrationCoreApiSetup {
     let createNestedNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.createNestedNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       createNestedNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let nullableStringArg = args[0] as? String
+        let args = message as! [Any]
+        let nullableStringArg = args[0] as! String?
         do {
           let result = try api.createNestedObject(with: nullableStringArg)
           reply(wrapResult(result))
@@ -628,10 +628,10 @@ class HostIntegrationCoreApiSetup {
     let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.sendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       sendMultipleNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
-        let aNullableIntArg = args[1] as? Int32
-        let aNullableStringArg = args[2] as? String
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
+        let aNullableIntArg = args[1] as! Int32?
+        let aNullableStringArg = args[2] as! String?
         do {
           let result = try api.sendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg)
           reply(wrapResult(result))
@@ -646,8 +646,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let aNullableIntArg = args[0] as! Int32?
         do {
           let result = try api.echo(aNullableIntArg)
           reply(wrapResult(result))
@@ -662,8 +662,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aNullableDoubleArg = args[0] as! Double?
         do {
           let result = try api.echo(aNullableDoubleArg)
           reply(wrapResult(result))
@@ -678,8 +678,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
         do {
           let result = try api.echo(aNullableBoolArg)
           reply(wrapResult(result))
@@ -694,8 +694,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aNullableStringArg = args[0] as! String?
         do {
           let result = try api.echo(aNullableStringArg)
           reply(wrapResult(result))
@@ -710,8 +710,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableUint8ListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aNullableUint8ListArg = args[0] as! FlutterStandardTypedData?
         do {
           let result = try api.echo(aNullableUint8ListArg)
           reply(wrapResult(result))
@@ -726,7 +726,7 @@ class HostIntegrationCoreApiSetup {
     let echoNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aNullableObjectArg = args[0]
         do {
           let result = try api.echo(aNullableObjectArg)
@@ -742,8 +742,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aNullableListArg = args[0] as! [Any?]?
         do {
           let result = try api.echoNullable(aNullableListArg)
           reply(wrapResult(result))
@@ -758,8 +758,8 @@ class HostIntegrationCoreApiSetup {
     let echoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aNullableMapArg = args[0] as! [String?: Any?]?
         do {
           let result = try api.echoNullable(aNullableMapArg)
           reply(wrapResult(result))
@@ -791,7 +791,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         api.echoAsync(anIntArg) { result in
           switch result {
@@ -809,7 +809,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         api.echoAsync(aDoubleArg) { result in
           switch result {
@@ -827,7 +827,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         api.echoAsync(aBoolArg) { result in
           switch result {
@@ -845,7 +845,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.echoAsync(aStringArg) { result in
           switch result {
@@ -863,7 +863,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aUint8ListArg = args[0] as! FlutterStandardTypedData
         api.echoAsync(aUint8ListArg) { result in
           switch result {
@@ -881,8 +881,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anObjectArg = args[0]!
+        let args = message as! [Any]
+        let anObjectArg = args[0]
         api.echoAsync(anObjectArg) { result in
           switch result {
             case .success(let res):
@@ -899,7 +899,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         api.echoAsync(aListArg) { result in
           switch result {
@@ -917,7 +917,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         api.echoAsync(aMapArg) { result in
           switch result {
@@ -967,7 +967,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         api.echoAsync(everythingArg) { result in
           switch result {
@@ -985,8 +985,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let everythingArg = args[0] as? AllNullableTypes
+        let args = message as! [Any]
+        let everythingArg = args[0] as! AllNullableTypes?
         api.echoAsync(everythingArg) { result in
           switch result {
             case .success(let res):
@@ -1003,8 +1003,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let anIntArg = args[0] as! Int32?
         api.echoAsyncNullable(anIntArg) { result in
           switch result {
             case .success(let res):
@@ -1021,8 +1021,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aDoubleArg = args[0] as! Double?
         api.echoAsyncNullable(aDoubleArg) { result in
           switch result {
             case .success(let res):
@@ -1039,8 +1039,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aBoolArg = args[0] as! Bool?
         api.echoAsyncNullable(aBoolArg) { result in
           switch result {
             case .success(let res):
@@ -1057,8 +1057,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aStringArg = args[0] as! String?
         api.echoAsyncNullable(aStringArg) { result in
           switch result {
             case .success(let res):
@@ -1075,8 +1075,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aUint8ListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aUint8ListArg = args[0] as! FlutterStandardTypedData?
         api.echoAsyncNullable(aUint8ListArg) { result in
           switch result {
             case .success(let res):
@@ -1093,7 +1093,7 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableObject", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableObjectChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anObjectArg = args[0]
         api.echoAsyncNullable(anObjectArg) { result in
           switch result {
@@ -1111,8 +1111,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aListArg = args[0] as! [Any?]?
         api.echoAsyncNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1129,8 +1129,8 @@ class HostIntegrationCoreApiSetup {
     let echoAsyncNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.echoAsyncNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       echoAsyncNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aMapArg = args[0] as! [String?: Any?]?
         api.echAsyncoNullable(aMapArg) { result in
           switch result {
             case .success(let res):
@@ -1191,7 +1191,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoAllTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let everythingArg = args[0] as! AllTypes
         api.callFlutterEcho(everythingArg) { result in
           switch result {
@@ -1208,10 +1208,10 @@ class HostIntegrationCoreApiSetup {
     let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aNullableBoolArg = args[0] as? Bool
-        let aNullableIntArg = args[1] as? Int32
-        let aNullableStringArg = args[2] as? String
+        let args = message as! [Any]
+        let aNullableBoolArg = args[0] as! Bool?
+        let aNullableIntArg = args[1] as! Int32?
+        let aNullableStringArg = args[2] as! String?
         api.callFlutterSendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg) { result in
           switch result {
             case .success(let res):
@@ -1227,7 +1227,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aBoolArg = args[0] as! Bool
         api.callFlutterEcho(aBoolArg) { result in
           switch result {
@@ -1244,7 +1244,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let anIntArg = args[0] as! Int32
         api.callFlutterEcho(anIntArg) { result in
           switch result {
@@ -1261,7 +1261,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aDoubleArg = args[0] as! Double
         api.callFlutterEcho(aDoubleArg) { result in
           switch result {
@@ -1278,7 +1278,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.callFlutterEcho(aStringArg) { result in
           switch result {
@@ -1295,7 +1295,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! FlutterStandardTypedData
         api.callFlutterEcho(aListArg) { result in
           switch result {
@@ -1312,7 +1312,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aListArg = args[0] as! [Any?]
         api.callFlutterEcho(aListArg) { result in
           switch result {
@@ -1329,7 +1329,7 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aMapArg = args[0] as! [String?: Any?]
         api.callFlutterEcho(aMapArg) { result in
           switch result {
@@ -1346,8 +1346,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aBoolArg = args[0] as? Bool
+        let args = message as! [Any]
+        let aBoolArg = args[0] as! Bool?
         api.callFlutterEchoNullable(aBoolArg) { result in
           switch result {
             case .success(let res):
@@ -1363,8 +1363,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let anIntArg = args[0] as? Int32
+        let args = message as! [Any]
+        let anIntArg = args[0] as! Int32?
         api.callFlutterEchoNullable(anIntArg) { result in
           switch result {
             case .success(let res):
@@ -1380,8 +1380,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aDoubleArg = args[0] as? Double
+        let args = message as! [Any]
+        let aDoubleArg = args[0] as! Double?
         api.callFlutterEchoNullable(aDoubleArg) { result in
           switch result {
             case .success(let res):
@@ -1397,8 +1397,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aStringArg = args[0] as? String
+        let args = message as! [Any]
+        let aStringArg = args[0] as! String?
         api.callFlutterEchoNullable(aStringArg) { result in
           switch result {
             case .success(let res):
@@ -1414,8 +1414,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? FlutterStandardTypedData
+        let args = message as! [Any]
+        let aListArg = args[0] as! FlutterStandardTypedData?
         api.callFlutterEchoNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1431,8 +1431,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableListChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aListArg = args[0] as? [Any?]
+        let args = message as! [Any]
+        let aListArg = args[0] as! [Any?]?
         api.callFlutterEchoNullable(aListArg) { result in
           switch result {
             case .success(let res):
@@ -1448,8 +1448,8 @@ class HostIntegrationCoreApiSetup {
     let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostIntegrationCoreApi.callFlutterEchoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let aMapArg = args[0] as? [String?: Any?]
+        let args = message as! [Any]
+        let aMapArg = args[0] as! [String?: Any?]?
         api.callFlutterEchoNullable(aMapArg) { result in
           switch result {
             case .success(let res):
@@ -1636,7 +1636,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Bool?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aBoolArg] as [Any?]) { response in
-      let result = response as? Bool
+      let result = response as! Bool?
       completion(result)
     }
   }
@@ -1644,7 +1644,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ anIntArg: Int32?, completion: @escaping (Int32?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([anIntArg] as [Any?]) { response in
-      let result = response as? Int32
+      let result = response as! Int32?
       completion(result)
     }
   }
@@ -1652,7 +1652,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aDoubleArg: Double?, completion: @escaping (Double?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aDoubleArg] as [Any?]) { response in
-      let result = response as? Double
+      let result = response as! Double?
       completion(result)
     }
   }
@@ -1660,7 +1660,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aStringArg: String?, completion: @escaping (String?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aStringArg] as [Any?]) { response in
-      let result = response as? String
+      let result = response as! String?
       completion(result)
     }
   }
@@ -1668,7 +1668,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aListArg: FlutterStandardTypedData?, completion: @escaping (FlutterStandardTypedData?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aListArg] as [Any?]) { response in
-      let result = response as? FlutterStandardTypedData
+      let result = response as! FlutterStandardTypedData?
       completion(result)
     }
   }
@@ -1676,7 +1676,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aListArg: [Any?]?, completion: @escaping ([Any?]?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aListArg] as [Any?]) { response in
-      let result = response as? [Any?]
+      let result = response as! [Any?]?
       completion(result)
     }
   }
@@ -1684,7 +1684,7 @@ class FlutterIntegrationCoreApi {
   func echoNullable(_ aMapArg: [String?: Any?]?, completion: @escaping ([String?: Any?]?) -> Void) {
     let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage([aMapArg] as [Any?]) { response in
-      let result = response as? [String?: Any?]
+      let result = response as! [String?: Any?]?
       completion(result)
     }
   }
@@ -1748,7 +1748,7 @@ class HostSmallApiSetup {
     let echoChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.HostSmallApi.echo", binaryMessenger: binaryMessenger)
     if let api = api {
       echoChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
+        let args = message as! [Any]
         let aStringArg = args[0] as! String
         api.echo(aString: aStringArg) { result in
           switch result {
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 fb7ec879e25e..792bbf37b306 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #undef _HAS_EXCEPTIONS
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 83c28aa13ff6..3ba0834c8a0e 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
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.5), do not edit directly.
+// Autogenerated from Pigeon (v9.0.6), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #ifndef PIGEON_CORE_TESTS_GEN_H_
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index c686386888fa..a8e34af22fdb 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%3Apigeon
-version: 9.0.5 # This must match the version in lib/generator_tools.dart
+version: 9.0.6 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart
index 18196cf1e165..dba6921f9534 100644
--- a/packages/pigeon/test/kotlin_generator_test.dart
+++ b/packages/pigeon/test/kotlin_generator_test.dart
@@ -1095,7 +1095,7 @@ void main() {
     expect(
         code,
         contains(
-            'val fooArg = args[0].let { if (it is Int) it.toLong() else it as? Long }'));
+            'val fooArg = args[0].let { if (it is Int) it.toLong() else it as Long? }'));
   });
 
   test('nullable argument flutter', () {
diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart
index 04d6016029a5..31703ce5f680 100644
--- a/packages/pigeon/test/swift_generator_test.dart
+++ b/packages/pigeon/test/swift_generator_test.dart
@@ -796,7 +796,7 @@ void main() {
     generator.generate(swiftOptions, root, sink);
     final String code = sink.toString();
     expect(code, contains('func add(x: Int32, y: Int32) throws -> Int32'));
-    expect(code, contains('let args = message as! [Any?]'));
+    expect(code, contains('let args = message as! [Any]'));
     expect(code, contains('let xArg = args[0] as! Int32'));
     expect(code, contains('let yArg = args[1] as! Int32'));
     expect(code, contains('let result = try api.add(x: xArg, y: yArg)'));
@@ -915,7 +915,7 @@ void main() {
     const SwiftGenerator generator = SwiftGenerator();
     generator.generate(swiftOptions, root, sink);
     final String code = sink.toString();
-    expect(code, contains('let fooArg = args[0] as? Int32'));
+    expect(code, contains('let fooArg = args[0] as! Int32?'));
   });
 
   test('nullable argument flutter', () {