diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9ca63de..9ed2401 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -114,8 +114,8 @@ kotlinxSerialization-jsonOkio   = { group = "org.jetbrains.kotlinx", name = "kot
 
 kotlinxSerialization-charleskornKaml = { group = "com.charleskorn.kaml", name = "kaml",            version.ref = "kxs-charleskornKaml" }
 kotlinxSerialization-mamoeYamlkt     = { group = "net.mamoe.yamlkt",     name = "yamlkt",          version.ref = "kxs-mamoeYamlkt"     }
-#kxs-kxsTsGen        = { group = "dev.adamko.kxstsgen",  name = "kxs-ts-gen-core", version.ref = "kxs-kxsTsGen"        }
-kotlinxSerialization-kxsTsGen        = { group = "com.github.adamko-dev.kotlinx-serialization-typescript-generator",  name = "kxs-ts-gen-core", version.ref = "kxs-kxsTsGen"        }
+kotlinxSerialization-kxsTsGen        = { group = "dev.adamko.kxstsgen",  name = "kxs-ts-gen-core", version.ref = "kxs-kxsTsGen"        }
+#kotlinxSerialization-kxsTsGen        = { group = "com.github.adamko-dev.kotlinx-serialization-typescript-generator",  name = "kxs-ts-gen-core", version.ref = "kxs-kxsTsGen"        }
 
 
 kotlinx-coroutines-bom         = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom",  version.ref = "kotlinx-coroutines" }
diff --git a/modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/library/json.kt b/modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/library/json.kt
index 33bdffc..af49f3d 100644
--- a/modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/library/json.kt
+++ b/modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/library/json.kt
@@ -25,10 +25,23 @@ val jsonMapperKafkatorio = Json {
 }
 
 
-/** @see LuaJsonListSerializer */
+/**
+ * Implements [Collection] by hand, rather than via delegation (`by list`), because delegation
+ * triggers a longstanding Kotlin compiler bug ("accidental override") on the generic `toArray`
+ * method - see [KT-3546](https://youtrack.jetbrains.com/issue/KT-3546). A hand-written
+ * implementation doesn't hit that bug, since it's specific to the delegation codegen path.
+ *
+ * @see LuaJsonListSerializer
+ */
 @Serializable(with = LuaJsonListSerializer::class)
 @JvmInline
-value class LuaJsonList<T>(private val list: List<T>) : List<T> by list
+value class LuaJsonList<T>(val list: List<T>) : Collection<T> {
+  override val size: Int get() = list.size
+  override fun isEmpty(): Boolean = list.isEmpty()
+  override fun contains(element: T): Boolean = list.contains(element)
+  override fun containsAll(elements: Collection<T>): Boolean = list.containsAll(elements)
+  override fun iterator(): Iterator<T> = list.iterator()
+}
 
 
 /**
@@ -68,7 +81,7 @@ class LuaJsonListSerializer<T>(
     }
 
   override fun serialize(encoder: Encoder, value: LuaJsonList<T>) {
-    encoder.encodeSerializableValue(listSerializer, value)
+    encoder.encodeSerializableValue(listSerializer, value.list)
   }
 
   companion object {
diff --git a/modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/schema/kt2ts2.kt b/modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/schema/kt2ts2.kt
index 903bc78..b421bea 100644
--- a/modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/schema/kt2ts2.kt
+++ b/modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/schema/kt2ts2.kt
@@ -42,9 +42,9 @@ fun main(args: Array<String>) {
     //@formatter:off
     Float .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.Float" ), TsTypeRef.Literal(TsLiteral.Custom("float" ), false)),
     Double.serializer().descriptor to TsTypeAlias(TsElementId("kotlin.Double"), TsTypeRef.Literal(TsLiteral.Custom("double"), false)),
-    Int   .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.Int"   ), TsTypeRef.Literal(TsLiteral.Custom("int"   ), false)),
+    Int   .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.Int"   ), TsTypeRef.Literal(TsLiteral.Custom("int32"   ), false)),
     Byte  .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.Byte"  ), TsTypeRef.Literal(TsLiteral.Custom("int8"  ), false)),
-    UInt  .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.UInt"  ), TsTypeRef.Literal(TsLiteral.Custom("uint"  ), false)),
+    UInt  .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.UInt"  ), TsTypeRef.Literal(TsLiteral.Custom("uint32"  ), false)),
     UByte .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.UByte" ), TsTypeRef.Literal(TsLiteral.Custom("uint8" ), false)),
     UShort.serializer().descriptor to TsTypeAlias(TsElementId("kotlin.UShort"), TsTypeRef.Literal(TsLiteral.Custom("uint16"), false)),
     ULong .serializer().descriptor to TsTypeAlias(TsElementId("kotlin.ULong" ), TsTypeRef.Literal(TsLiteral.Custom("uint64"), false)),
@@ -78,6 +78,8 @@ fun main(args: Array<String>) {
 val kt2tsHeader = """
   |// Generated by kxs-ts-gen - do not edit this file manually
   |
+  |import {double, float, int32, int8, PlayerIndex, SurfaceIndex, uint32, uint8, UnitNumber} from "factorio:runtime"
+  |
 """.trimMargin()
 
 
diff --git a/modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts
index 92657bc..c26833e 100644
--- a/modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts
+++ b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts
@@ -1,6 +1,6 @@
 // Generated by kxs-ts-gen - do not edit this file manually
 
-import {double, float, int32 as int, int8, PlayerIndex, SurfaceIndex, uint32 as uint, uint8, UnitNumber} from "factorio:runtime"
+import {double, float, int32, int8, PlayerIndex, SurfaceIndex, uint32, uint8, UnitNumber} from "factorio:runtime"
 
 export interface KafkatorioPacket {
   modVersion: string;
@@ -145,7 +145,7 @@ export namespace KafkatorioPacketData {
   }
 }
 
-export type UInt = uint;
+export type UInt = uint32;
 
 export interface ConfigurationUpdateGameData {
   oldVersion?: string | null;
@@ -212,7 +212,7 @@ export type Colour = [
   alpha: Float,
 ];
 
-export type Int = int;
+export type Int = int32;
 
 export interface ConfigurationUpdateModData {
   modName: string;