diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart
index a35cfe6106e1..5e7784bf8ba3 100644
--- a/packages/pigeon/lib/objc_generator.dart
+++ b/packages/pigeon/lib/objc_generator.dart
@@ -580,7 +580,7 @@ class ObjcSourceGenerator extends StructuredGenerator<ObjcOptions> {
       enumerate(getFieldsInSerializationOrder(classDefinition),
           (int index, final NamedType field) {
         final bool isEnumType = field.type.isEnum;
-        final String valueGetter = "GetNullableObjectAtIndex(list, $index)";
+        final String valueGetter = 'GetNullableObjectAtIndex(list, $index)';
         final String? primitiveExtractionMethod =
             _nsnumberExtractionMethod(field.type);
         final String ivarValueExpression;
diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart
index 736875f55561..2051e4a12a52 100644
--- a/packages/pigeon/test/kotlin_generator_test.dart
+++ b/packages/pigeon/test/kotlin_generator_test.dart
@@ -390,7 +390,7 @@ void main() {
     expect(
         code,
         contains(
-            'val aInt = __pigeon_list[1].let { if (it is Int) it.toLong() else it as Long }'));
+            'val aInt = __pigeon_list[1].let { num -> if (num is Int) num.toLong() else num as Long }'));
     expect(code, contains('val aNullableBool: Boolean? = null'));
     expect(code, contains('val aNullableInt: Long? = null'));
     expect(code, contains('val aNullableDouble: Double? = null'));
@@ -402,7 +402,7 @@ void main() {
     expect(
         code,
         contains(
-            'val aNullableInt = __pigeon_list[9].let { if (it is Int) it.toLong() else it as Long? }'));
+            'val aNullableInt = __pigeon_list[9].let { num -> if (num is Int) num.toLong() else num as Long? }'));
   });
 
   test('gen one flutter api', () {
@@ -1162,11 +1162,11 @@ void main() {
     expect(
         code,
         contains(
-            'val xArg = args[0].let { if (it is Int) it.toLong() else it as Long }'));
+            'val xArg = args[0].let { num -> if (num is Int) num.toLong() else num as Long }'));
     expect(
         code,
         contains(
-            'val yArg = args[1].let { if (it is Int) it.toLong() else it as Long }'));
+            'val yArg = args[1].let { num -> if (num is Int) num.toLong() else num as Long }'));
     expect(code, contains('listOf<Any?>(api.add(xArg, yArg))'));
     expect(code, contains('reply.reply(wrapped)'));
   });
@@ -1205,7 +1205,7 @@ void main() {
     expect(
       code,
       contains(
-          'val output = it[0].let { if (it is Int) it.toLong() else it as Long }'),
+          'val output = it[0].let { num -> if (num is Int) num.toLong() else num as Long }'),
     );
     expect(code, contains('callback(Result.success(output))'));
     expect(
@@ -1310,7 +1310,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 { num -> if (num is Int) num.toLong() else num as Long? }'));
   });
 
   test('nullable argument flutter', () {
diff --git a/packages/pigeon/test/objc_generator_test.dart b/packages/pigeon/test/objc_generator_test.dart
index c0d46b120355..49ab94b78bc7 100644
--- a/packages/pigeon/test/objc_generator_test.dart
+++ b/packages/pigeon/test/objc_generator_test.dart
@@ -530,10 +530,8 @@ void main() {
     );
     final String code = sink.toString();
     expect(code, contains('@implementation Foobar'));
-    expect(
-        code,
-        contains(
-            'pigeonResult.aBool = GetNullableObjectAtIndex(__pigeon_list, 0);'));
+    expect(code,
+        contains('pigeonResult.aBool = GetNullableObjectAtIndex(list, 0);'));
   });
 
   test('nested class header', () {
@@ -602,10 +600,8 @@ void main() {
       dartPackageName: DEFAULT_PACKAGE_NAME,
     );
     final String code = sink.toString();
-    expect(
-        code,
-        contains(
-            'pigeonResult.nested = GetNullableObjectAtIndex(__pigeon_list, 0);'));
+    expect(code,
+        contains('pigeonResult.nested = GetNullableObjectAtIndex(list, 0);'));
   });
 
   test('prefix class header', () {
diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart
index 253546aaeaa7..8fb544bbedb2 100644
--- a/packages/pigeon/test/swift_generator_test.dart
+++ b/packages/pigeon/test/swift_generator_test.dart
@@ -578,7 +578,8 @@ void main() {
     expect(code, contains('var nested: Nested? = nil'));
     expect(code,
         contains('static func fromList(_ __pigeon_list: [Any?]) -> Outer?'));
-    expect(code, contains('nested = nestedList as Nested'));
+    expect(
+        code, contains('let nested: Nested? = nilOrValue(__pigeon_list[0])'));
     expect(code, contains('func toList() -> [Any?]'));
     expect(code, isNot(contains('if (')));
     // Single-element list serializations should not have a trailing comma.